Mercurial Repositories > eric / changeset
changeset
Merged with default branch to prepare a new release.
Fri, 03 Feb 2017 19:20:59 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Fri, 03 Feb 2017 19:20:59 +0100
- branch
- maintenance
- changeset 5468
- c307358a2ecc
- parent 5447
- 852016bbdedb (current diff)
- parent 5467
- 44ab42f1e8b1 (diff)
- child 5469
- b46f68bbd6b4
Merged with default branch to prepare a new release.
diff -r 852016bbdedb -r c307358a2ecc APIs/Python3/eric6.api --- a/APIs/Python3/eric6.api Fri Jan 27 19:18:52 2017 +0100 +++ b/APIs/Python3/eric6.api Fri Feb 03 19:20:59 2017 +0100 @@ -2985,10 +2985,17 @@ eric6.Helpviewer.QtHelpDocumentationDialog.QtHelpDocumentationDialog.on_addButton_clicked?4() eric6.Helpviewer.QtHelpDocumentationDialog.QtHelpDocumentationDialog.on_addPluginButton_clicked?4() eric6.Helpviewer.QtHelpDocumentationDialog.QtHelpDocumentationDialog.on_documentsList_itemSelectionChanged?4() +eric6.Helpviewer.QtHelpDocumentationDialog.QtHelpDocumentationDialog.on_managePluginButton_clicked?4() eric6.Helpviewer.QtHelpDocumentationDialog.QtHelpDocumentationDialog.on_removeButton_clicked?4() eric6.Helpviewer.QtHelpDocumentationDialog.QtHelpDocumentationDialog?1(engine, parent) +eric6.Helpviewer.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.AddMode?7 +eric6.Helpviewer.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.ManageMode?7 eric6.Helpviewer.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.getData?4() -eric6.Helpviewer.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog?1(helpDocuments, parent=None) +eric6.Helpviewer.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked?4() +eric6.Helpviewer.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.on_deleteButton_clicked?4() +eric6.Helpviewer.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked?4() +eric6.Helpviewer.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged?4() +eric6.Helpviewer.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog?1(helpDocuments, mode, parent=None) eric6.Helpviewer.QtHelpFiltersDialog.QtHelpFiltersDialog.on_addButton_clicked?4() eric6.Helpviewer.QtHelpFiltersDialog.QtHelpFiltersDialog.on_attributesList_itemChanged?4(item, column) eric6.Helpviewer.QtHelpFiltersDialog.QtHelpFiltersDialog.on_attributesList_itemSelectionChanged?4() @@ -4090,6 +4097,7 @@ eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle._main?5() eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle._parse_multi_options?5(options, split_token=', ') eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.ambiguous_identifier?4(logical_line, tokens) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.bare_except?4(logical_line, noqa) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.blank_lines?4(logical_line, blank_lines, indent_level, line_number, blank_before, previous_logical, previous_unindented_logical_line, previous_indent_level, lines) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.break_around_binary_operator?4(logical_line, tokens) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.comparison_negative?4(logical_line) @@ -4876,6 +4884,7 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_diffP1Button_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_diffP2Button_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_diffRevisionsButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_downButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_fieldCombo_activated?4(txt) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_findNextButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_findPrevButton_clicked?4() @@ -4892,16 +4901,10 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_sendButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_stopCheckBox_clicked?4(checked) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_toDate_dateChanged?4(date) +eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_upButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.show?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.start?4(fn, bundle=None, isFile=False) +eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.start?4(fn, bundle=None, isFile=False, noEntries=0) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog?1(vcs, mode="log", parent=None) -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.closeEvent?4(e) -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.keyPressEvent?4(evt) -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.on_input_returnPressed?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.on_passwordCheckBox_toggled?4(isOn) -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.on_sendButton_clicked?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.start?4(fn, noEntries=0, revisions=None) -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog?1(vcs, mode="log", bundle=None, isFile=False, parent=None) eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.getParameters?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_bookmarkButton_toggled?4(checked) eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_bookmarkCombo_editTextChanged?4(txt) @@ -4912,17 +4915,6 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_tagButton_toggled?4(checked) eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_tagCombo_editTextChanged?4(txt) eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog?1(tagsList, branchesList, bookmarksList=None, parent=None) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.getRevisions?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled?4(checked) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged?4(txt) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_branchButton_toggled?4(checked) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged?4(txt) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_changesetsButton_toggled?4(checked) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_limitGroup_toggled?4(checked) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_tagButton_toggled?4(checked) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged?4(txt) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog?1(tagsList, branchesList, bookmarksList=None, emptyRevsOk=False, showLimit=False, limitDefault=100, parent=None) eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog.getData?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog.on_protocolCombo_activated?4(protocol) eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog.on_vcsProjectDirPicker_textChanged?4(txt) @@ -5395,7 +5387,6 @@ eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsImport?4(vcsDataDict, projectDir, noDialog=False) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsInit?4(vcsDir, noDialog=False) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsInitConfig?4(project) -eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsLog?4(name) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsLogBrowser?4(name, isFile=False) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsMerge?4(name) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsMove?4(name, project, target=None, noDialog=False) @@ -5490,6 +5481,7 @@ eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_buttonBox_clicked?4(button) eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_diffPreviousButton_clicked?4() eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_diffRevisionsButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_downButton_clicked?4() eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_fieldCombo_activated?4(txt) eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_fromDate_dateChanged?4(date) eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_logTree_currentItemChanged?4(current, previous) @@ -5498,12 +5490,10 @@ eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_rxEdit_textChanged?4(txt) eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_stopCheckBox_clicked?4(checked) eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_toDate_dateChanged?4(date) +eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_upButton_clicked?4() eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.show?4() eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.start?4(fn, isFile=False) eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog?1(vcs, parent=None) -eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.SvnLogDialog.on_buttonBox_clicked?4(button) -eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.SvnLogDialog.start?4(fn, noEntries=0) -eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.SvnLogDialog?1(vcs, isFile=False, parent=None) eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.SvnLoginDialog.getData?4() eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.SvnLoginDialog?1(realm, username, may_save, parent=None) eric6.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.SvnMergeDialog.getParameters?4() @@ -5621,7 +5611,6 @@ eric6.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsImport?4(vcsDataDict, projectDir, noDialog=False) eric6.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsInit?4(vcsDir, noDialog=False) eric6.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsInitConfig?4(project) -eric6.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsLog?4(name) eric6.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsLogBrowser?4(name, isFile=False) eric6.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsMerge?4(name) eric6.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsMove?4(name, project, target=None, noDialog=False) @@ -5721,6 +5710,7 @@ eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_buttonBox_clicked?4(button) eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_diffPreviousButton_clicked?4() eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_diffRevisionsButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_downButton_clicked?4() eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_fieldCombo_activated?4(txt) eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_fromDate_dateChanged?4(date) eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_input_returnPressed?4() @@ -5732,16 +5722,10 @@ eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_sendButton_clicked?4() eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_stopCheckBox_clicked?4(checked) eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_toDate_dateChanged?4(date) +eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_upButton_clicked?4() eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.show?4() eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.start?4(fn, isFile=False) eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog?1(vcs, parent=None) -eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.closeEvent?4(e) -eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.keyPressEvent?4(evt) -eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.on_input_returnPressed?4() -eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.on_passwordCheckBox_toggled?4(isOn) -eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.on_sendButton_clicked?4() -eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.start?4(fn, noEntries=0) -eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog?1(vcs, isFile=False, parent=None) eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.SvnMergeDialog.getParameters?4() eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.SvnMergeDialog.on_tag1Combo_editTextChanged?4(text) eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.SvnMergeDialog.on_tag2Combo_editTextChanged?4(text) @@ -5865,7 +5849,6 @@ eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsImport?4(vcsDataDict, projectDir, noDialog=False) eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsInit?4(vcsDir, noDialog=False) eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsInitConfig?4(project) -eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsLog?4(name) eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsLogBrowser?4(name, isFile=False) eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsMerge?4(name) eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsMove?4(name, project, target=None, noDialog=False) @@ -6364,10 +6347,14 @@ eric6.Preferences.ConfigurationPages.EditorTypingPage.EditorTypingPage.save?4() eric6.Preferences.ConfigurationPages.EditorTypingPage.EditorTypingPage?1() eric6.Preferences.ConfigurationPages.EditorTypingPage.create?4(dlg) -eric6.Preferences.ConfigurationPages.EmailPage.EmailPage.on_mailAuthenticationCheckBox_toggled?4(checked) +eric6.Preferences.ConfigurationPages.EmailPage.EmailPage.on_mailAuthenticationGroup_toggled?4(checked) eric6.Preferences.ConfigurationPages.EmailPage.EmailPage.on_mailPasswordEdit_textChanged?4(txt) +eric6.Preferences.ConfigurationPages.EmailPage.EmailPage.on_mailServerEdit_textChanged?4(txt) eric6.Preferences.ConfigurationPages.EmailPage.EmailPage.on_mailUserEdit_textChanged?4(txt) +eric6.Preferences.ConfigurationPages.EmailPage.EmailPage.on_noEncryptionButton_toggled?4(checked) eric6.Preferences.ConfigurationPages.EmailPage.EmailPage.on_testButton_clicked?4() +eric6.Preferences.ConfigurationPages.EmailPage.EmailPage.on_useSslButton_toggled?4(checked) +eric6.Preferences.ConfigurationPages.EmailPage.EmailPage.on_useTlsButton_toggled?4(checked) eric6.Preferences.ConfigurationPages.EmailPage.EmailPage.save?4() eric6.Preferences.ConfigurationPages.EmailPage.EmailPage?1() eric6.Preferences.ConfigurationPages.EmailPage.create?4(dlg) @@ -7402,6 +7389,7 @@ eric6.QScintilla.Editor.Editor.setNoName?4(noName) eric6.QScintilla.Editor.Editor.setSearchIndicator?4(startPos, indicLength) eric6.QScintilla.Editor.Editor.setSpellingForProject?4() +eric6.QScintilla.Editor.Editor.settingsRead?7 eric6.QScintilla.Editor.Editor.shareConnected?4(connected) eric6.QScintilla.Editor.Editor.shareEditor?4(share) eric6.QScintilla.Editor.Editor.shortenEmptyLines?4() @@ -7437,6 +7425,9 @@ eric6.QScintilla.EditorAssembly.EditorAssembly.getEditor?4() eric6.QScintilla.EditorAssembly.EditorAssembly.shutdownTimer?4() eric6.QScintilla.EditorAssembly.EditorAssembly?1(dbs, fn="", vm=None, filetype="", editor=None, tv=None) +eric6.QScintilla.EditorButtonsWidget.EditorButtonsWidget.resizeEvent?4(evt) +eric6.QScintilla.EditorButtonsWidget.EditorButtonsWidget.show?4() +eric6.QScintilla.EditorButtonsWidget.EditorButtonsWidget?1(editor, parent=None) eric6.QScintilla.EditorMarkerMap.EditorMarkerMap._paintIt?5(painter) eric6.QScintilla.EditorMarkerMap.EditorMarkerMap.initColors?4() eric6.QScintilla.EditorMarkerMap.EditorMarkerMap?1(parent=None) @@ -7609,6 +7600,12 @@ eric6.QScintilla.Lexers.LexerIDL.LexerIDL.isStringStyle?4(style) eric6.QScintilla.Lexers.LexerIDL.LexerIDL.maximumKeywordSet?4() eric6.QScintilla.Lexers.LexerIDL.LexerIDL?1(parent=None) +eric6.QScintilla.Lexers.LexerJSON.LexerJSON.defaultKeywords?4(kwSet) +eric6.QScintilla.Lexers.LexerJSON.LexerJSON.initProperties?4() +eric6.QScintilla.Lexers.LexerJSON.LexerJSON.isCommentStyle?4(style) +eric6.QScintilla.Lexers.LexerJSON.LexerJSON.isStringStyle?4(style) +eric6.QScintilla.Lexers.LexerJSON.LexerJSON.maximumKeywordSet?4() +eric6.QScintilla.Lexers.LexerJSON.LexerJSON?1(parent=None) eric6.QScintilla.Lexers.LexerJava.LexerJava.defaultKeywords?4(kwSet) eric6.QScintilla.Lexers.LexerJava.LexerJava.initProperties?4() eric6.QScintilla.Lexers.LexerJava.LexerJava.isCommentStyle?4(style) @@ -7632,6 +7629,8 @@ eric6.QScintilla.Lexers.LexerMakefile.LexerMakefile.isCommentStyle?4(style) eric6.QScintilla.Lexers.LexerMakefile.LexerMakefile.isStringStyle?4(style) eric6.QScintilla.Lexers.LexerMakefile.LexerMakefile?1(parent=None) +eric6.QScintilla.Lexers.LexerMarkdown.LexerMarkdown.defaultKeywords?4(kwSet) +eric6.QScintilla.Lexers.LexerMarkdown.LexerMarkdown?1(parent=None) eric6.QScintilla.Lexers.LexerMatlab.LexerMatlab.defaultKeywords?4(kwSet) eric6.QScintilla.Lexers.LexerMatlab.LexerMatlab.isCommentStyle?4(style) eric6.QScintilla.Lexers.LexerMatlab.LexerMatlab.isStringStyle?4(style) @@ -7804,6 +7803,124 @@ eric6.QScintilla.Lexers.getSupportedLanguages?4() eric6.QScintilla.Lexers.registerLexer?4(name, displayString, filenameSample, getLexerFunc, openFilters=[], saveFilters=[], defaultAssocs=[], iconFileName="") eric6.QScintilla.Lexers.unregisterLexer?4(name) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.bold?4(editor) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.bulletedList?4(editor) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.code?4(editor) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.codeBlock?4(editor) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.hasBold?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.hasBulletedList?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.hasCode?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.hasCodeBlock?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.hasHyperlink?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.hasImage?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.hasItalic?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.hasLine?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.hasNumberedList?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.hasQuote?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.hasStrikethrough?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.header?4(editor, level) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.headerLevels?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.hyperlink?4(editor) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.image?4(editor) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.italic?4(editor) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.kind?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.line?4(editor) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.numberedList?4(editor) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.quote?4(editor) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.strikethrough?4(editor) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider?1() +eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.HyperlinkMarkupDialog.getData?4() +eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.HyperlinkMarkupDialog.on_targetEdit_textChanged?4(txt) +eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.HyperlinkMarkupDialog.on_textEdit_textChanged?4(txt) +eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.HyperlinkMarkupDialog?1(textMayBeEmpty, targetMayBeEmpty, noTitle=False, parent=None) +eric6.QScintilla.MarkupProviders.ImageMarkupDialog.ImageMarkupDialog.HtmlMode?7 +eric6.QScintilla.MarkupProviders.ImageMarkupDialog.ImageMarkupDialog.MarkDownMode?7 +eric6.QScintilla.MarkupProviders.ImageMarkupDialog.ImageMarkupDialog.RestMode?7 +eric6.QScintilla.MarkupProviders.ImageMarkupDialog.ImageMarkupDialog.getData?4() +eric6.QScintilla.MarkupProviders.ImageMarkupDialog.ImageMarkupDialog.on_altTextEdit_textChanged?4(txt) +eric6.QScintilla.MarkupProviders.ImageMarkupDialog.ImageMarkupDialog.on_aspectRatioCheckBox_toggled?4(checked) +eric6.QScintilla.MarkupProviders.ImageMarkupDialog.ImageMarkupDialog.on_heightSpinBox_valueChanged?4(height) +eric6.QScintilla.MarkupProviders.ImageMarkupDialog.ImageMarkupDialog.on_imagePicker_textChanged?4(address) +eric6.QScintilla.MarkupProviders.ImageMarkupDialog.ImageMarkupDialog.on_sizeCheckBox_toggled?4(checked) +eric6.QScintilla.MarkupProviders.ImageMarkupDialog.ImageMarkupDialog.on_widthSpinBox_valueChanged?4(width) +eric6.QScintilla.MarkupProviders.ImageMarkupDialog.ImageMarkupDialog?1(mode, parent=None) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.bold?4(editor) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.bulletedList?4(editor) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.code?4(editor) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.codeBlock?4(editor) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.hasBold?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.hasBulletedList?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.hasCode?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.hasCodeBlock?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.hasHyperlink?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.hasImage?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.hasItalic?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.hasLine?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.hasNumberedList?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.hasQuote?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.hasStrikethrough?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.header?4(editor, level) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.headerLevels?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.hyperlink?4(editor) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.image?4(editor) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.italic?4(editor) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.kind?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.line?4(editor) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.numberedList?4(editor) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.quote?4(editor) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.strikethrough?4(editor) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider?1() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.bold?4(editor) +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.bulletedList?4(editor) +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.code?4(editor) +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.codeBlock?4(editor) +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.hasBold?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.hasBulletedList?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.hasCode?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.hasCodeBlock?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.hasHyperlink?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.hasImage?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.hasItalic?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.hasLine?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.hasNumberedList?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.hasQuote?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.hasStrikethrough?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.header?4(editor, level) +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.headerLevels?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.hyperlink?4(editor) +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.image?4(editor) +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.italic?4(editor) +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.kind?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.line?4(editor) +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.numberedList?4(editor) +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.quote?4(editor) +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.strikethrough?4(editor) +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase?1() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.bold?4(editor) +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.bulletedList?4(editor) +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.code?4(editor) +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.codeBlock?4(editor) +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.hasBold?4() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.hasBulletedList?4() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.hasCode?4() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.hasCodeBlock?4() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.hasHyperlink?4() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.hasImage?4() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.hasItalic?4() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.hasLine?4() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.hasNumberedList?4() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.hasQuote?4() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.header?4(editor, level) +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.headerLevels?4() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.hyperlink?4(editor) +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.image?4(editor) +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.italic?4(editor) +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.kind?4() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.line?4(editor) +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.numberedList?4(editor) +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.quote?4(editor) +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider?1() +eric6.QScintilla.MarkupProviders.getMarkupProvider?4(editor) eric6.QScintilla.MiniEditor.MiniEditor.activeWindow?4() eric6.QScintilla.MiniEditor.MiniEditor.clearSearchIndicators?4() eric6.QScintilla.MiniEditor.MiniEditor.closeEvent?4(event) @@ -8617,11 +8734,8 @@ eric6.UI.Previewer.Previewer.show?4() eric6.UI.Previewer.Previewer.shutdown?4() eric6.UI.Previewer.Previewer?1(viewmanager, splitter, parent=None) -eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread.DefaultStaticPath?7 -eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread.StaticRegexp?7 eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread.htmlReady?7 eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread.process?4(filePath, language, text, ssiEnabled, rootPath, useSphinx) -eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread.replace?4() eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread.run?4() eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread?1(parent=None) eric6.UI.Previewers.PreviewerHTML.PreviewerHTML.on_jsCheckBox_clicked?4(checked) @@ -9187,7 +9301,6 @@ eric6.VCS.VersionControl.VersionControl.vcsImport?4(vcsDataDict, projectDir, noDialog=False) eric6.VCS.VersionControl.VersionControl.vcsInit?4(vcsDir, noDialog=False) eric6.VCS.VersionControl.VersionControl.vcsInitConfig?4(project) -eric6.VCS.VersionControl.VersionControl.vcsLog?4(name) eric6.VCS.VersionControl.VersionControl.vcsLogBrowser?4(name, isFile=False) eric6.VCS.VersionControl.VersionControl.vcsMerge?4(name) eric6.VCS.VersionControl.VersionControl.vcsMove?4(name, project, target=None, noDialog=False) @@ -10325,10 +10438,17 @@ eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.QtHelpDocumentationDialog.on_addButton_clicked?4() eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.QtHelpDocumentationDialog.on_addPluginButton_clicked?4() eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.QtHelpDocumentationDialog.on_documentsList_itemSelectionChanged?4() +eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.QtHelpDocumentationDialog.on_managePluginButton_clicked?4() eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.QtHelpDocumentationDialog.on_removeButton_clicked?4() eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.QtHelpDocumentationDialog?1(engine, parent) +eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.AddMode?7 +eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.ManageMode?7 eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.getData?4() -eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog?1(helpDocuments, parent=None) +eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked?4() +eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.on_deleteButton_clicked?4() +eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked?4() +eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged?4() +eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog?1(helpDocuments, mode, parent=None) eric6.WebBrowser.QtHelp.QtHelpFiltersDialog.QtHelpFiltersDialog.on_addButton_clicked?4() eric6.WebBrowser.QtHelp.QtHelpFiltersDialog.QtHelpFiltersDialog.on_attributesList_itemChanged?4(item, column) eric6.WebBrowser.QtHelp.QtHelpFiltersDialog.QtHelpFiltersDialog.on_attributesList_itemSelectionChanged?4() @@ -11102,6 +11222,7 @@ eric6.uninstall-debugclients.uninstallEricDebugClients?4() eric6.uninstall-debugclients.usage?4(rcode=2) eric6.uninstall.PythonMarkers?7 +eric6.uninstall.currDir?7 eric6.uninstall.defaultMacAppBundleName?7 eric6.uninstall.defaultMacAppBundlePath?7 eric6.uninstall.exit?4(rcode=0)
diff -r 852016bbdedb -r c307358a2ecc APIs/Python3/eric6.bas --- a/APIs/Python3/eric6.bas Fri Jan 27 19:18:52 2017 +0100 +++ b/APIs/Python3/eric6.bas Fri Feb 03 19:20:59 2017 +0100 @@ -219,6 +219,7 @@ EditorAssembly QWidget EditorAutocompletionPage ConfigurationPageBase Ui_EditorAutocompletionPage EditorAutocompletionQScintillaPage ConfigurationPageBase Ui_EditorAutocompletionQScintillaPage +EditorButtonsWidget QWidget EditorCalltipsPage ConfigurationPageBase Ui_EditorCalltipsPage EditorCalltipsQScintillaPage ConfigurationPageBase Ui_EditorCalltipsQScintillaPage EditorExportersPage ConfigurationPageBase Ui_EditorExportersPage @@ -369,9 +370,7 @@ HgHisteditPlanEditor QDialog Ui_HgHisteditPlanEditor HgImportDialog QDialog Ui_HgImportDialog HgLogBrowserDialog QWidget Ui_HgLogBrowserDialog -HgLogDialog QWidget Ui_HgLogDialog HgMergeDialog QDialog Ui_HgMergeDialog -HgMultiRevisionSelectionDialog QDialog Ui_HgMultiRevisionSelectionDialog HgNewProjectOptionsDialog QDialog Ui_HgNewProjectOptionsDialog HgOptionsDialog QDialog Ui_HgOptionsDialog HgPhaseDialog QDialog Ui_HgPhaseDialog @@ -423,6 +422,8 @@ HistoryMostVisitedMenuModel QSortFilterProxyModel HistoryTreeModel QAbstractProxyModel HtmlImporter BookmarksImporter +HtmlProvider MarkupBase +HyperlinkMarkupDialog QDialog Ui_HyperlinkMarkupDialog IExplorerImporter BookmarksImporter IconEditCommand QUndoCommand IconEditorGrid QWidget @@ -431,6 +432,7 @@ IconSizeDialog QDialog Ui_IconSizeDialog IconsPage ConfigurationPageBase Ui_IconsPage IconsPreviewDialog QDialog Ui_IconsPreviewDialog +ImageMarkupDialog QDialog Ui_ImageMarkupDialog ImageSearchEngine QObject ImagesIcon StatusBarIcon ImportsDiagramBuilder UMLDiagramBuilder @@ -476,10 +478,12 @@ LexerFortran77 Lexer QsciLexerFortran77 LexerHTML Lexer QsciLexerHTML LexerIDL Lexer QsciLexerIDL +LexerJSON Lexer QsciLexerJSON LexerJava Lexer QsciLexerJava LexerJavaScript Lexer QsciLexerJavaScript LexerLua Lexer QsciLexerLua LexerMakefile Lexer QsciLexerMakefile +LexerMarkdown Lexer QsciLexerMarkdown LexerMatlab Lexer QsciLexerMatlab LexerOctave Lexer QsciLexerOctave LexerPO Lexer QsciLexerPO @@ -505,6 +509,7 @@ LogViewer QWidget LogViewerEdit QTextEdit LogViewerPage ConfigurationPageBase Ui_LogViewerPage +MarkdownProvider MarkupBase MasterPasswordEntryDialog QDialog Ui_MasterPasswordEntryDialog MercurialPage ConfigurationPageBase Ui_MercurialPage MessageBoxWizard QObject @@ -668,6 +673,7 @@ RecursionError OverflowError ValueError Redirector QObject RemoveBookmarksCommand QUndoCommand +RestructuredTextProvider MarkupBase SafariImporter BookmarksImporter SchemeAccessHandler QObject SearchReplaceSlidingWidget QWidget @@ -736,7 +742,6 @@ SvnDiffHighlighter E5GenericDiffHighlighter SvnInfoDialog QDialog SvnDialogMixin Ui_VcsRepositoryInfoDialog SvnLogBrowserDialog QWidget Ui_SvnLogBrowserDialog -SvnLogDialog QWidget Ui_SvnLogDialog SvnLoginDialog QDialog Ui_SvnLoginDialog SvnMergeDialog QDialog Ui_SvnMergeDialog SvnNewProjectOptionsDialog QDialog Ui_SvnNewProjectOptionsDialog
diff -r 852016bbdedb -r c307358a2ecc DebugClients/Python/eric6dbgstub.py --- a/DebugClients/Python/eric6dbgstub.py Fri Jan 27 19:18:52 2017 +0100 +++ b/DebugClients/Python/eric6dbgstub.py Fri Feb 03 19:20:59 2017 +0100 @@ -37,9 +37,6 @@ if kind == "standard": import DebugClient debugger = DebugClient.DebugClient() - elif kind == "threads": - import DebugClientThreads - debugger = DebugClientThreads.DebugClientThreads() else: raise ValueError except ImportError:
diff -r 852016bbdedb -r c307358a2ecc Debugger/ExceptionsFilterDialog.ui --- a/Debugger/ExceptionsFilterDialog.ui Fri Jan 27 19:18:52 2017 +0100 +++ b/Debugger/ExceptionsFilterDialog.ui Fri Feb 03 19:20:59 2017 +0100 @@ -1,113 +1,106 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>ExceptionsFilterDialog</class> - <widget class="QDialog" name="ExceptionsFilterDialog" > - <property name="geometry" > + <widget class="QDialog" name="ExceptionsFilterDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>464</width> - <height>385</height> + <width>450</width> + <height>400</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Exceptions Filter</string> </property> - <property name="whatsThis" > - <string><b>Exception Filter</b> -<p>This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the "Start Debugging" dialog is unchecked, no exception will be reported at all.</p> -<p>Please note, that unhandled exceptions are always highlighted independent of these settings.</p></string> + <property name="whatsThis"> + <string><b>Exception Filter</b> +<p>This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the "Start Debugging" dialog is unchecked, no exception will be reported at all.</p> +<p>Please note, that unhandled exceptions are always highlighted independent of these settings.</p></string> </property> - <property name="sizeGripEnabled" > + <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout" name="verticalLayout" > - <item> - <widget class="QListWidget" name="exceptionList" > - <property name="toolTip" > + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0" colspan="3"> + <widget class="QListWidget" name="exceptionList"> + <property name="toolTip"> <string>List of exceptions that shall be highlighted</string> </property> - <property name="alternatingRowColors" > + <property name="alternatingRowColors"> <bool>true</bool> </property> </widget> </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout" > - <item> - <widget class="QPushButton" name="addButton" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="toolTip" > - <string>Press to add the entered exception to the list</string> - </property> - <property name="text" > - <string>Add</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="exceptionEdit" > - <property name="toolTip" > - <string>Enter an exception type that shall be highlighted</string> - </property> - </widget> - </item> - </layout> + <item row="1" column="0"> + <widget class="QPushButton" name="addButton"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Press to add the entered exception to the list</string> + </property> + <property name="text"> + <string>Add</string> + </property> + </widget> + </item> + <item row="1" column="1" colspan="2"> + <widget class="QLineEdit" name="exceptionEdit"> + <property name="toolTip"> + <string>Enter an exception type that shall be highlighted</string> + </property> + </widget> </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_2" > - <item> - <widget class="QPushButton" name="deleteButton" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="toolTip" > - <string>Press to delete the selected exception from the list</string> - </property> - <property name="text" > - <string>Delete</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="deleteAllButton" > - <property name="toolTip" > - <string>Press to delete all exceptions from the list</string> - </property> - <property name="text" > - <string>Delete All</string> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> + <item row="2" column="0"> + <widget class="QPushButton" name="deleteButton"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Press to delete the selected exception from the list</string> + </property> + <property name="text"> + <string>Delete</string> + </property> + </widget> </item> - <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <item row="2" column="1"> + <widget class="QPushButton" name="deleteAllButton"> + <property name="toolTip"> + <string>Press to delete all exceptions from the list</string> + </property> + <property name="text"> + <string>Delete All</string> + </property> + </widget> + </item> + <item row="2" column="2"> + <spacer name="horizontalSpacer"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="sizeHint" stdset="0"> + <size> + <width>261</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="3" column="0" colspan="3"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> </item> </layout> </widget> - <layoutdefault spacing="6" margin="11" /> + <layoutdefault spacing="6" margin="11"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <tabstops> <tabstop>exceptionList</tabstop> @@ -125,11 +118,11 @@ <receiver>ExceptionsFilterDialog</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>26</x> <y>309</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>26</x> <y>325</y> </hint> @@ -141,11 +134,11 @@ <receiver>ExceptionsFilterDialog</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>85</x> <y>310</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>85</x> <y>324</y> </hint>
diff -r 852016bbdedb -r c307358a2ecc Debugger/VariablesFilterDialog.py --- a/Debugger/VariablesFilterDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Debugger/VariablesFilterDialog.py Fri Feb 03 19:20:59 2017 +0100 @@ -47,6 +47,9 @@ for varType, varTypeStr in ConfigVarTypeDispStrings.items(): itm = QListWidgetItem(self.tr(varTypeStr), widget) itm.setData(Qt.UserRole, ConfigVarTypeFilters[varType]) + itm.setFlags(Qt.ItemIsEnabled | Qt.ItemIsUserCheckable | + Qt.ItemNeverHasChildren) + itm.setCheckState(Qt.Unchecked) widget.addItem(itm) lDefaultFilter, gDefaultFilter = Preferences.getVarFilters() @@ -62,13 +65,13 @@ lList = [] for row in range(self.localsList.count()): itm = self.localsList.item(row) - if itm.isSelected(): + if itm.checkState() == Qt.Unchecked: lList.append(itm.data(Qt.UserRole)) gList = [] for row in range(self.globalsList.count()): itm = self.globalsList.item(row) - if itm.isSelected(): + if itm.checkState() == Qt.Unchecked: gList.append(itm.data(Qt.UserRole)) return (lList, gList) @@ -81,11 +84,17 @@ """ for row in range(self.localsList.count()): itm = self.localsList.item(row) - itm.setSelected(itm.data(Qt.UserRole) in lList) + if itm.data(Qt.UserRole) in lList: + itm.setCheckState(Qt.Unchecked) + else: + itm.setCheckState(Qt.Checked) for row in range(self.globalsList.count()): itm = self.globalsList.item(row) - itm.setSelected(itm.data(Qt.UserRole) in gList) + if itm.data(Qt.UserRole) in gList: + itm.setCheckState(Qt.Unchecked) + else: + itm.setCheckState(Qt.Checked) def on_buttonBox_clicked(self, button): """
diff -r 852016bbdedb -r c307358a2ecc Debugger/VariablesFilterDialog.ui --- a/Debugger/VariablesFilterDialog.ui Fri Jan 27 19:18:52 2017 +0100 +++ b/Debugger/VariablesFilterDialog.ui Fri Feb 03 19:20:59 2017 +0100 @@ -7,8 +7,8 @@ <rect> <x>0</x> <y>0</y> - <width>386</width> - <height>338</height> + <width>400</width> + <height>400</height> </rect> </property> <property name="windowTitle"> @@ -21,45 +21,45 @@ <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QGridLayout"> - <item row="2" column="0" colspan="2"> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0" colspan="2"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Select the variable types to be shown in the variables viewers:</string> </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + <property name="wordWrap"> + <bool>true</bool> </property> </widget> </item> - <item row="0" column="0"> + <item row="1" column="0"> <widget class="QLabel" name="localsLabel"> <property name="text"> - <string>&Locals Filter</string> + <string>&Locals Viewer</string> </property> <property name="buddy"> <cstring>localsList</cstring> </property> </widget> </item> - <item row="0" column="1"> + <item row="1" column="1"> <widget class="QLabel" name="globalsLabel"> <property name="text"> - <string>&Globals Filter</string> + <string>&Globals Viewer</string> </property> <property name="buddy"> <cstring>globalsList</cstring> </property> </widget> </item> - <item row="1" column="0"> + <item row="2" column="0"> <widget class="QListWidget" name="localsList"> <property name="toolTip"> <string>Locals Filter List</string> </property> <property name="whatsThis"> <string><b>Locals Filter List</b> -<p>Select the variable types you want to be filtered out of the locals variables list.</p<</string> +<p>Select the variable types you want to be shown in the local variables viewer.</p<</string> </property> <property name="alternatingRowColors"> <bool>true</bool> @@ -72,14 +72,14 @@ </property> </widget> </item> - <item row="1" column="1"> + <item row="2" column="1"> <widget class="QListWidget" name="globalsList"> <property name="toolTip"> <string>Globals Filter List</string> </property> <property name="whatsThis"> <string><b>Globals Filter List</b> -<p>Select the variable types you want to be filtered out of the globals variables list.</p<</string> +<p>Select the variable types you want to be shown in the global variables viewer.</p<</string> </property> <property name="alternatingRowColors"> <bool>true</bool> @@ -92,6 +92,16 @@ </property> </widget> </item> + <item row="3" column="0" colspan="2"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> </layout> </widget> <layoutdefault spacing="6" margin="11"/>
diff -r 852016bbdedb -r c307358a2ecc Documentation/Help/source.qch Binary file Documentation/Help/source.qch has changed
diff -r 852016bbdedb -r c307358a2ecc Documentation/Help/source.qhp --- a/Documentation/Help/source.qhp Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Help/source.qhp Fri Feb 03 19:20:59 2017 +0100 @@ -606,9 +606,7 @@ <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgImportDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html" /> - <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html" /> - <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog.html" /> @@ -648,7 +646,6 @@ <section title="eric6.Plugins.VcsPlugins.vcsPySvn.SvnDiffHighlighter" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnDiffHighlighter.html" /> <section title="eric6.Plugins.VcsPlugins.vcsPySvn.SvnInfoDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnInfoDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html" /> - <section title="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog.html" /> @@ -684,7 +681,6 @@ <section title="eric6.Plugins.VcsPlugins.vcsSubversion.SvnDiffDialog" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnDiffDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsSubversion.SvnDiffHighlighter" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnDiffHighlighter.html" /> <section title="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html" /> - <section title="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog.html" /> @@ -901,10 +897,12 @@ <section title="eric6.QScintilla.Lexers.LexerFortran77" ref="eric6.QScintilla.Lexers.LexerFortran77.html" /> <section title="eric6.QScintilla.Lexers.LexerHTML" ref="eric6.QScintilla.Lexers.LexerHTML.html" /> <section title="eric6.QScintilla.Lexers.LexerIDL" ref="eric6.QScintilla.Lexers.LexerIDL.html" /> + <section title="eric6.QScintilla.Lexers.LexerJSON" ref="eric6.QScintilla.Lexers.LexerJSON.html" /> <section title="eric6.QScintilla.Lexers.LexerJava" ref="eric6.QScintilla.Lexers.LexerJava.html" /> <section title="eric6.QScintilla.Lexers.LexerJavaScript" ref="eric6.QScintilla.Lexers.LexerJavaScript.html" /> <section title="eric6.QScintilla.Lexers.LexerLua" ref="eric6.QScintilla.Lexers.LexerLua.html" /> <section title="eric6.QScintilla.Lexers.LexerMakefile" ref="eric6.QScintilla.Lexers.LexerMakefile.html" /> + <section title="eric6.QScintilla.Lexers.LexerMarkdown" ref="eric6.QScintilla.Lexers.LexerMarkdown.html" /> <section title="eric6.QScintilla.Lexers.LexerMatlab" ref="eric6.QScintilla.Lexers.LexerMatlab.html" /> <section title="eric6.QScintilla.Lexers.LexerOctave" ref="eric6.QScintilla.Lexers.LexerOctave.html" /> <section title="eric6.QScintilla.Lexers.LexerPO" ref="eric6.QScintilla.Lexers.LexerPO.html" /> @@ -925,6 +923,15 @@ <section title="eric6.QScintilla.Lexers.LexerYAML" ref="eric6.QScintilla.Lexers.LexerYAML.html" /> <section title="eric6.QScintilla.Lexers.__init__" ref="eric6.QScintilla.Lexers.__init__.html" /> </section> + <section title="eric6.QScintilla.MarkupProviders" ref="index-eric6.QScintilla.MarkupProviders.html"> + <section title="eric6.QScintilla.MarkupProviders.HtmlProvider" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html" /> + <section title="eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog" ref="eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html" /> + <section title="eric6.QScintilla.MarkupProviders.ImageMarkupDialog" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html" /> + <section title="eric6.QScintilla.MarkupProviders.MarkdownProvider" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html" /> + <section title="eric6.QScintilla.MarkupProviders.MarkupBase" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html" /> + <section title="eric6.QScintilla.MarkupProviders.RestructuredTextProvider" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html" /> + <section title="eric6.QScintilla.MarkupProviders.__init__" ref="eric6.QScintilla.MarkupProviders.__init__.html" /> + </section> <section title="eric6.QScintilla.TypingCompleters" ref="index-eric6.QScintilla.TypingCompleters.html"> <section title="eric6.QScintilla.TypingCompleters.CompleterBase" ref="eric6.QScintilla.TypingCompleters.CompleterBase.html" /> <section title="eric6.QScintilla.TypingCompleters.CompleterPython" ref="eric6.QScintilla.TypingCompleters.CompleterPython.html" /> @@ -934,6 +941,7 @@ <section title="eric6.QScintilla.APIsManager" ref="eric6.QScintilla.APIsManager.html" /> <section title="eric6.QScintilla.Editor" ref="eric6.QScintilla.Editor.html" /> <section title="eric6.QScintilla.EditorAssembly" ref="eric6.QScintilla.EditorAssembly.html" /> + <section title="eric6.QScintilla.EditorButtonsWidget" ref="eric6.QScintilla.EditorButtonsWidget.html" /> <section title="eric6.QScintilla.EditorMarkerMap" ref="eric6.QScintilla.EditorMarkerMap.html" /> <section title="eric6.QScintilla.GotoDialog" ref="eric6.QScintilla.GotoDialog.html" /> <section title="eric6.QScintilla.KeySequenceTranslator" ref="eric6.QScintilla.KeySequenceTranslator.html" /> @@ -5202,6 +5210,23 @@ <keyword name="EditorAutocompletionQScintillaPage (Constructor)" id="EditorAutocompletionQScintillaPage (Constructor)" ref="eric6.Preferences.ConfigurationPages.EditorAutocompletionQScintillaPage.html#EditorAutocompletionQScintillaPage.__init__" /> <keyword name="EditorAutocompletionQScintillaPage (Module)" id="EditorAutocompletionQScintillaPage (Module)" ref="eric6.Preferences.ConfigurationPages.EditorAutocompletionQScintillaPage.html" /> <keyword name="EditorAutocompletionQScintillaPage.save" id="EditorAutocompletionQScintillaPage.save" ref="eric6.Preferences.ConfigurationPages.EditorAutocompletionQScintillaPage.html#EditorAutocompletionQScintillaPage.save" /> + <keyword name="EditorButtonsWidget" id="EditorButtonsWidget" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget" /> + <keyword name="EditorButtonsWidget (Constructor)" id="EditorButtonsWidget (Constructor)" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__init__" /> + <keyword name="EditorButtonsWidget (Module)" id="EditorButtonsWidget (Module)" ref="eric6.QScintilla.EditorButtonsWidget.html" /> + <keyword name="EditorButtonsWidget.__addButton" id="EditorButtonsWidget.__addButton" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__addButton" /> + <keyword name="EditorButtonsWidget.__addSeparator" id="EditorButtonsWidget.__addSeparator" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__addSeparator" /> + <keyword name="EditorButtonsWidget.__createButtons" id="EditorButtonsWidget.__createButtons" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__createButtons" /> + <keyword name="EditorButtonsWidget.__editorSelectionChanged" id="EditorButtonsWidget.__editorSelectionChanged" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__editorSelectionChanged" /> + <keyword name="EditorButtonsWidget.__editorSettingsRead" id="EditorButtonsWidget.__editorSettingsRead" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__editorSettingsRead" /> + <keyword name="EditorButtonsWidget.__enableScrollerButtons" id="EditorButtonsWidget.__enableScrollerButtons" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__enableScrollerButtons" /> + <keyword name="EditorButtonsWidget.__formatClicked" id="EditorButtonsWidget.__formatClicked" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__formatClicked" /> + <keyword name="EditorButtonsWidget.__headerMenuTriggered" id="EditorButtonsWidget.__headerMenuTriggered" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__headerMenuTriggered" /> + <keyword name="EditorButtonsWidget.__slide" id="EditorButtonsWidget.__slide" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__slide" /> + <keyword name="EditorButtonsWidget.__slideDown" id="EditorButtonsWidget.__slideDown" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__slideDown" /> + <keyword name="EditorButtonsWidget.__slideUp" id="EditorButtonsWidget.__slideUp" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__slideUp" /> + <keyword name="EditorButtonsWidget.__updateButtonStates" id="EditorButtonsWidget.__updateButtonStates" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__updateButtonStates" /> + <keyword name="EditorButtonsWidget.resizeEvent" id="EditorButtonsWidget.resizeEvent" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.resizeEvent" /> + <keyword name="EditorButtonsWidget.show" id="EditorButtonsWidget.show" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.show" /> <keyword name="EditorCalltipsPage" id="EditorCalltipsPage" ref="eric6.Preferences.ConfigurationPages.EditorCalltipsPage.html#EditorCalltipsPage" /> <keyword name="EditorCalltipsPage (Constructor)" id="EditorCalltipsPage (Constructor)" ref="eric6.Preferences.ConfigurationPages.EditorCalltipsPage.html#EditorCalltipsPage.__init__" /> <keyword name="EditorCalltipsPage (Module)" id="EditorCalltipsPage (Module)" ref="eric6.Preferences.ConfigurationPages.EditorCalltipsPage.html" /> @@ -5341,11 +5366,16 @@ <keyword name="EmailPage" id="EmailPage" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage" /> <keyword name="EmailPage (Constructor)" id="EmailPage (Constructor)" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.__init__" /> <keyword name="EmailPage (Module)" id="EmailPage (Module)" ref="eric6.Preferences.ConfigurationPages.EmailPage.html" /> + <keyword name="EmailPage.__updatePortSpin" id="EmailPage.__updatePortSpin" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.__updatePortSpin" /> <keyword name="EmailPage.__updateTestButton" id="EmailPage.__updateTestButton" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.__updateTestButton" /> - <keyword name="EmailPage.on_mailAuthenticationCheckBox_toggled" id="EmailPage.on_mailAuthenticationCheckBox_toggled" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.on_mailAuthenticationCheckBox_toggled" /> + <keyword name="EmailPage.on_mailAuthenticationGroup_toggled" id="EmailPage.on_mailAuthenticationGroup_toggled" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.on_mailAuthenticationGroup_toggled" /> <keyword name="EmailPage.on_mailPasswordEdit_textChanged" id="EmailPage.on_mailPasswordEdit_textChanged" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.on_mailPasswordEdit_textChanged" /> + <keyword name="EmailPage.on_mailServerEdit_textChanged" id="EmailPage.on_mailServerEdit_textChanged" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.on_mailServerEdit_textChanged" /> <keyword name="EmailPage.on_mailUserEdit_textChanged" id="EmailPage.on_mailUserEdit_textChanged" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.on_mailUserEdit_textChanged" /> + <keyword name="EmailPage.on_noEncryptionButton_toggled" id="EmailPage.on_noEncryptionButton_toggled" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.on_noEncryptionButton_toggled" /> <keyword name="EmailPage.on_testButton_clicked" id="EmailPage.on_testButton_clicked" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.on_testButton_clicked" /> + <keyword name="EmailPage.on_useSslButton_toggled" id="EmailPage.on_useSslButton_toggled" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.on_useSslButton_toggled" /> + <keyword name="EmailPage.on_useTlsButton_toggled" id="EmailPage.on_useTlsButton_toggled" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.on_useTlsButton_toggled" /> <keyword name="EmailPage.save" id="EmailPage.save" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.save" /> <keyword name="EmptyNetworkReply" id="EmptyNetworkReply" ref="eric6.Helpviewer.Network.EmptyNetworkReply.html#EmptyNetworkReply" /> <keyword name="EmptyNetworkReply (Constructor)" id="EmptyNetworkReply (Constructor)" ref="eric6.Helpviewer.Network.EmptyNetworkReply.html#EmptyNetworkReply.__init__" /> @@ -7125,7 +7155,6 @@ <keyword name="Hg.vcsImport" id="Hg.vcsImport" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsImport" /> <keyword name="Hg.vcsInit" id="Hg.vcsInit" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsInit" /> <keyword name="Hg.vcsInitConfig" id="Hg.vcsInitConfig" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsInitConfig" /> - <keyword name="Hg.vcsLog" id="Hg.vcsLog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsLog" /> <keyword name="Hg.vcsLogBrowser" id="Hg.vcsLogBrowser" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsLogBrowser" /> <keyword name="Hg.vcsMerge" id="Hg.vcsMerge" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsMerge" /> <keyword name="Hg.vcsMove" id="Hg.vcsMove" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsMove" /> @@ -7523,6 +7552,7 @@ <keyword name="HgLogBrowserDialog (Constructor)" id="HgLogBrowserDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__init__" /> <keyword name="HgLogBrowserDialog (Module)" id="HgLogBrowserDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html" /> <keyword name="HgLogBrowserDialog.__actionMode" id="HgLogBrowserDialog.__actionMode" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__actionMode" /> + <keyword name="HgLogBrowserDialog.__addFinishCallback" id="HgLogBrowserDialog.__addFinishCallback" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__addFinishCallback" /> <keyword name="HgLogBrowserDialog.__bookmarkActTriggered" id="HgLogBrowserDialog.__bookmarkActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__bookmarkActTriggered" /> <keyword name="HgLogBrowserDialog.__bookmarkMoveActTriggered" id="HgLogBrowserDialog.__bookmarkMoveActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__bookmarkMoveActTriggered" /> <keyword name="HgLogBrowserDialog.__branchColor" id="HgLogBrowserDialog.__branchColor" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__branchColor" /> @@ -7539,6 +7569,7 @@ <keyword name="HgLogBrowserDialog.__getColor" id="HgLogBrowserDialog.__getColor" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__getColor" /> <keyword name="HgLogBrowserDialog.__getLogEntries" id="HgLogBrowserDialog.__getLogEntries" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__getLogEntries" /> <keyword name="HgLogBrowserDialog.__getParents" id="HgLogBrowserDialog.__getParents" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__getParents" /> + <keyword name="HgLogBrowserDialog.__getRevisionOfTag" id="HgLogBrowserDialog.__getRevisionOfTag" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__getRevisionOfTag" /> <keyword name="HgLogBrowserDialog.__graftActTriggered" id="HgLogBrowserDialog.__graftActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__graftActTriggered" /> <keyword name="HgLogBrowserDialog.__identifyProject" id="HgLogBrowserDialog.__identifyProject" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__identifyProject" /> <keyword name="HgLogBrowserDialog.__initActionsMenu" id="HgLogBrowserDialog.__initActionsMenu" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__initActionsMenu" /> @@ -7558,6 +7589,7 @@ <keyword name="HgLogBrowserDialog.__resizeColumnsFiles" id="HgLogBrowserDialog.__resizeColumnsFiles" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__resizeColumnsFiles" /> <keyword name="HgLogBrowserDialog.__resizeColumnsLog" id="HgLogBrowserDialog.__resizeColumnsLog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__resizeColumnsLog" /> <keyword name="HgLogBrowserDialog.__resortFiles" id="HgLogBrowserDialog.__resortFiles" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__resortFiles" /> + <keyword name="HgLogBrowserDialog.__revisionClicked" id="HgLogBrowserDialog.__revisionClicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__revisionClicked" /> <keyword name="HgLogBrowserDialog.__showError" id="HgLogBrowserDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__showError" /> <keyword name="HgLogBrowserDialog.__stripActTriggered" id="HgLogBrowserDialog.__stripActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__stripActTriggered" /> <keyword name="HgLogBrowserDialog.__switchActTriggered" id="HgLogBrowserDialog.__switchActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__switchActTriggered" /> @@ -7573,6 +7605,7 @@ <keyword name="HgLogBrowserDialog.on_diffP1Button_clicked" id="HgLogBrowserDialog.on_diffP1Button_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_diffP1Button_clicked" /> <keyword name="HgLogBrowserDialog.on_diffP2Button_clicked" id="HgLogBrowserDialog.on_diffP2Button_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_diffP2Button_clicked" /> <keyword name="HgLogBrowserDialog.on_diffRevisionsButton_clicked" id="HgLogBrowserDialog.on_diffRevisionsButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_diffRevisionsButton_clicked" /> + <keyword name="HgLogBrowserDialog.on_downButton_clicked" id="HgLogBrowserDialog.on_downButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_downButton_clicked" /> <keyword name="HgLogBrowserDialog.on_fieldCombo_activated" id="HgLogBrowserDialog.on_fieldCombo_activated" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_fieldCombo_activated" /> <keyword name="HgLogBrowserDialog.on_findNextButton_clicked" id="HgLogBrowserDialog.on_findNextButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_findNextButton_clicked" /> <keyword name="HgLogBrowserDialog.on_findPrevButton_clicked" id="HgLogBrowserDialog.on_findPrevButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_findPrevButton_clicked" /> @@ -7589,25 +7622,9 @@ <keyword name="HgLogBrowserDialog.on_sendButton_clicked" id="HgLogBrowserDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_sendButton_clicked" /> <keyword name="HgLogBrowserDialog.on_stopCheckBox_clicked" id="HgLogBrowserDialog.on_stopCheckBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_stopCheckBox_clicked" /> <keyword name="HgLogBrowserDialog.on_toDate_dateChanged" id="HgLogBrowserDialog.on_toDate_dateChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_toDate_dateChanged" /> + <keyword name="HgLogBrowserDialog.on_upButton_clicked" id="HgLogBrowserDialog.on_upButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_upButton_clicked" /> <keyword name="HgLogBrowserDialog.show" id="HgLogBrowserDialog.show" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.show" /> <keyword name="HgLogBrowserDialog.start" id="HgLogBrowserDialog.start" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.start" /> - <keyword name="HgLogDialog" id="HgLogDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog" /> - <keyword name="HgLogDialog (Constructor)" id="HgLogDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__init__" /> - <keyword name="HgLogDialog (Module)" id="HgLogDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html" /> - <keyword name="HgLogDialog.__finish" id="HgLogDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__finish" /> - <keyword name="HgLogDialog.__getParents" id="HgLogDialog.__getParents" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__getParents" /> - <keyword name="HgLogDialog.__procFinished" id="HgLogDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__procFinished" /> - <keyword name="HgLogDialog.__processOutputLine" id="HgLogDialog.__processOutputLine" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__processOutputLine" /> - <keyword name="HgLogDialog.__readStderr" id="HgLogDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__readStderr" /> - <keyword name="HgLogDialog.__readStdout" id="HgLogDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__readStdout" /> - <keyword name="HgLogDialog.__showError" id="HgLogDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__showError" /> - <keyword name="HgLogDialog.__sourceChanged" id="HgLogDialog.__sourceChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__sourceChanged" /> - <keyword name="HgLogDialog.closeEvent" id="HgLogDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.closeEvent" /> - <keyword name="HgLogDialog.keyPressEvent" id="HgLogDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.keyPressEvent" /> - <keyword name="HgLogDialog.on_input_returnPressed" id="HgLogDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.on_input_returnPressed" /> - <keyword name="HgLogDialog.on_passwordCheckBox_toggled" id="HgLogDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.on_passwordCheckBox_toggled" /> - <keyword name="HgLogDialog.on_sendButton_clicked" id="HgLogDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.on_sendButton_clicked" /> - <keyword name="HgLogDialog.start" id="HgLogDialog.start" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.start" /> <keyword name="HgMergeDialog" id="HgMergeDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog" /> <keyword name="HgMergeDialog (Constructor)" id="HgMergeDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.__init__" /> <keyword name="HgMergeDialog (Module)" id="HgMergeDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html" /> @@ -7621,20 +7638,6 @@ <keyword name="HgMergeDialog.on_idEdit_textChanged" id="HgMergeDialog.on_idEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.on_idEdit_textChanged" /> <keyword name="HgMergeDialog.on_tagButton_toggled" id="HgMergeDialog.on_tagButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.on_tagButton_toggled" /> <keyword name="HgMergeDialog.on_tagCombo_editTextChanged" id="HgMergeDialog.on_tagCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.on_tagCombo_editTextChanged" /> - <keyword name="HgMultiRevisionSelectionDialog" id="HgMultiRevisionSelectionDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog" /> - <keyword name="HgMultiRevisionSelectionDialog (Constructor)" id="HgMultiRevisionSelectionDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.__init__" /> - <keyword name="HgMultiRevisionSelectionDialog (Module)" id="HgMultiRevisionSelectionDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html" /> - <keyword name="HgMultiRevisionSelectionDialog.__updateOK" id="HgMultiRevisionSelectionDialog.__updateOK" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.__updateOK" /> - <keyword name="HgMultiRevisionSelectionDialog.getRevisions" id="HgMultiRevisionSelectionDialog.getRevisions" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.getRevisions" /> - <keyword name="HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled" id="HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled" /> - <keyword name="HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged" id="HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged" /> - <keyword name="HgMultiRevisionSelectionDialog.on_branchButton_toggled" id="HgMultiRevisionSelectionDialog.on_branchButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_branchButton_toggled" /> - <keyword name="HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged" id="HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged" /> - <keyword name="HgMultiRevisionSelectionDialog.on_changesetsButton_toggled" id="HgMultiRevisionSelectionDialog.on_changesetsButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_changesetsButton_toggled" /> - <keyword name="HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged" id="HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged" /> - <keyword name="HgMultiRevisionSelectionDialog.on_limitGroup_toggled" id="HgMultiRevisionSelectionDialog.on_limitGroup_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_limitGroup_toggled" /> - <keyword name="HgMultiRevisionSelectionDialog.on_tagButton_toggled" id="HgMultiRevisionSelectionDialog.on_tagButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_tagButton_toggled" /> - <keyword name="HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged" id="HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged" /> <keyword name="HgNewProjectOptionsDialog" id="HgNewProjectOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html#HgNewProjectOptionsDialog" /> <keyword name="HgNewProjectOptionsDialog (Constructor)" id="HgNewProjectOptionsDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html#HgNewProjectOptionsDialog.__init__" /> <keyword name="HgNewProjectOptionsDialog (Module)" id="HgNewProjectOptionsDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html" /> @@ -8452,6 +8455,43 @@ <keyword name="HtmlImporter.open" id="HtmlImporter.open" ref="eric6.WebBrowser.Bookmarks.BookmarksImporters.HtmlImporter.html#HtmlImporter.open" /> <keyword name="HtmlImporter.setPath" id="HtmlImporter.setPath" ref="eric6.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html#HtmlImporter.setPath" /> <keyword name="HtmlImporter.setPath" id="HtmlImporter.setPath" ref="eric6.WebBrowser.Bookmarks.BookmarksImporters.HtmlImporter.html#HtmlImporter.setPath" /> + <keyword name="HtmlProvider" id="HtmlProvider" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider" /> + <keyword name="HtmlProvider (Constructor)" id="HtmlProvider (Constructor)" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.__init__" /> + <keyword name="HtmlProvider (Module)" id="HtmlProvider (Module)" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html" /> + <keyword name="HtmlProvider.__insertMarkup" id="HtmlProvider.__insertMarkup" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.__insertMarkup" /> + <keyword name="HtmlProvider.__makeList" id="HtmlProvider.__makeList" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.__makeList" /> + <keyword name="HtmlProvider.bold" id="HtmlProvider.bold" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.bold" /> + <keyword name="HtmlProvider.bulletedList" id="HtmlProvider.bulletedList" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.bulletedList" /> + <keyword name="HtmlProvider.code" id="HtmlProvider.code" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.code" /> + <keyword name="HtmlProvider.codeBlock" id="HtmlProvider.codeBlock" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.codeBlock" /> + <keyword name="HtmlProvider.hasBold" id="HtmlProvider.hasBold" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.hasBold" /> + <keyword name="HtmlProvider.hasBulletedList" id="HtmlProvider.hasBulletedList" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.hasBulletedList" /> + <keyword name="HtmlProvider.hasCode" id="HtmlProvider.hasCode" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.hasCode" /> + <keyword name="HtmlProvider.hasCodeBlock" id="HtmlProvider.hasCodeBlock" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.hasCodeBlock" /> + <keyword name="HtmlProvider.hasHyperlink" id="HtmlProvider.hasHyperlink" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.hasHyperlink" /> + <keyword name="HtmlProvider.hasImage" id="HtmlProvider.hasImage" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.hasImage" /> + <keyword name="HtmlProvider.hasItalic" id="HtmlProvider.hasItalic" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.hasItalic" /> + <keyword name="HtmlProvider.hasLine" id="HtmlProvider.hasLine" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.hasLine" /> + <keyword name="HtmlProvider.hasNumberedList" id="HtmlProvider.hasNumberedList" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.hasNumberedList" /> + <keyword name="HtmlProvider.hasQuote" id="HtmlProvider.hasQuote" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.hasQuote" /> + <keyword name="HtmlProvider.hasStrikethrough" id="HtmlProvider.hasStrikethrough" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.hasStrikethrough" /> + <keyword name="HtmlProvider.header" id="HtmlProvider.header" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.header" /> + <keyword name="HtmlProvider.headerLevels" id="HtmlProvider.headerLevels" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.headerLevels" /> + <keyword name="HtmlProvider.hyperlink" id="HtmlProvider.hyperlink" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.hyperlink" /> + <keyword name="HtmlProvider.image" id="HtmlProvider.image" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.image" /> + <keyword name="HtmlProvider.italic" id="HtmlProvider.italic" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.italic" /> + <keyword name="HtmlProvider.kind" id="HtmlProvider.kind" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.kind" /> + <keyword name="HtmlProvider.line" id="HtmlProvider.line" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.line" /> + <keyword name="HtmlProvider.numberedList" id="HtmlProvider.numberedList" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.numberedList" /> + <keyword name="HtmlProvider.quote" id="HtmlProvider.quote" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.quote" /> + <keyword name="HtmlProvider.strikethrough" id="HtmlProvider.strikethrough" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.strikethrough" /> + <keyword name="HyperlinkMarkupDialog" id="HyperlinkMarkupDialog" ref="eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html#HyperlinkMarkupDialog" /> + <keyword name="HyperlinkMarkupDialog (Constructor)" id="HyperlinkMarkupDialog (Constructor)" ref="eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html#HyperlinkMarkupDialog.__init__" /> + <keyword name="HyperlinkMarkupDialog (Module)" id="HyperlinkMarkupDialog (Module)" ref="eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html" /> + <keyword name="HyperlinkMarkupDialog.__updateOkButton" id="HyperlinkMarkupDialog.__updateOkButton" ref="eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html#HyperlinkMarkupDialog.__updateOkButton" /> + <keyword name="HyperlinkMarkupDialog.getData" id="HyperlinkMarkupDialog.getData" ref="eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html#HyperlinkMarkupDialog.getData" /> + <keyword name="HyperlinkMarkupDialog.on_targetEdit_textChanged" id="HyperlinkMarkupDialog.on_targetEdit_textChanged" ref="eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html#HyperlinkMarkupDialog.on_targetEdit_textChanged" /> + <keyword name="HyperlinkMarkupDialog.on_textEdit_textChanged" id="HyperlinkMarkupDialog.on_textEdit_textChanged" ref="eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html#HyperlinkMarkupDialog.on_textEdit_textChanged" /> <keyword name="IExplorerImporter" id="IExplorerImporter" ref="eric6.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.html#IExplorerImporter" /> <keyword name="IExplorerImporter" id="IExplorerImporter" ref="eric6.WebBrowser.Bookmarks.BookmarksImporters.IExplorerImporter.html#IExplorerImporter" /> <keyword name="IExplorerImporter (Constructor)" id="IExplorerImporter (Constructor)" ref="eric6.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.html#IExplorerImporter.__init__" /> @@ -8597,6 +8637,17 @@ <keyword name="IconsPreviewDialog" id="IconsPreviewDialog" ref="eric6.Preferences.ConfigurationPages.IconsPreviewDialog.html#IconsPreviewDialog" /> <keyword name="IconsPreviewDialog (Constructor)" id="IconsPreviewDialog (Constructor)" ref="eric6.Preferences.ConfigurationPages.IconsPreviewDialog.html#IconsPreviewDialog.__init__" /> <keyword name="IconsPreviewDialog (Module)" id="IconsPreviewDialog (Module)" ref="eric6.Preferences.ConfigurationPages.IconsPreviewDialog.html" /> + <keyword name="ImageMarkupDialog" id="ImageMarkupDialog" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html#ImageMarkupDialog" /> + <keyword name="ImageMarkupDialog (Constructor)" id="ImageMarkupDialog (Constructor)" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html#ImageMarkupDialog.__init__" /> + <keyword name="ImageMarkupDialog (Module)" id="ImageMarkupDialog (Module)" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html" /> + <keyword name="ImageMarkupDialog.__updateOkButton" id="ImageMarkupDialog.__updateOkButton" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html#ImageMarkupDialog.__updateOkButton" /> + <keyword name="ImageMarkupDialog.getData" id="ImageMarkupDialog.getData" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html#ImageMarkupDialog.getData" /> + <keyword name="ImageMarkupDialog.on_altTextEdit_textChanged" id="ImageMarkupDialog.on_altTextEdit_textChanged" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html#ImageMarkupDialog.on_altTextEdit_textChanged" /> + <keyword name="ImageMarkupDialog.on_aspectRatioCheckBox_toggled" id="ImageMarkupDialog.on_aspectRatioCheckBox_toggled" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html#ImageMarkupDialog.on_aspectRatioCheckBox_toggled" /> + <keyword name="ImageMarkupDialog.on_heightSpinBox_valueChanged" id="ImageMarkupDialog.on_heightSpinBox_valueChanged" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html#ImageMarkupDialog.on_heightSpinBox_valueChanged" /> + <keyword name="ImageMarkupDialog.on_imagePicker_textChanged" id="ImageMarkupDialog.on_imagePicker_textChanged" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html#ImageMarkupDialog.on_imagePicker_textChanged" /> + <keyword name="ImageMarkupDialog.on_sizeCheckBox_toggled" id="ImageMarkupDialog.on_sizeCheckBox_toggled" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html#ImageMarkupDialog.on_sizeCheckBox_toggled" /> + <keyword name="ImageMarkupDialog.on_widthSpinBox_valueChanged" id="ImageMarkupDialog.on_widthSpinBox_valueChanged" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html#ImageMarkupDialog.on_widthSpinBox_valueChanged" /> <keyword name="ImageSearch (Package)" id="ImageSearch (Package)" ref="index-eric6.WebBrowser.ImageSearch.html" /> <keyword name="ImageSearchEngine" id="ImageSearchEngine" ref="eric6.WebBrowser.ImageSearch.ImageSearchEngine.html#ImageSearchEngine" /> <keyword name="ImageSearchEngine (Constructor)" id="ImageSearchEngine (Constructor)" ref="eric6.WebBrowser.ImageSearch.ImageSearchEngine.html#ImageSearchEngine.__init__" /> @@ -9183,6 +9234,14 @@ <keyword name="LexerIDL.isCommentStyle" id="LexerIDL.isCommentStyle" ref="eric6.QScintilla.Lexers.LexerIDL.html#LexerIDL.isCommentStyle" /> <keyword name="LexerIDL.isStringStyle" id="LexerIDL.isStringStyle" ref="eric6.QScintilla.Lexers.LexerIDL.html#LexerIDL.isStringStyle" /> <keyword name="LexerIDL.maximumKeywordSet" id="LexerIDL.maximumKeywordSet" ref="eric6.QScintilla.Lexers.LexerIDL.html#LexerIDL.maximumKeywordSet" /> + <keyword name="LexerJSON" id="LexerJSON" ref="eric6.QScintilla.Lexers.LexerJSON.html#LexerJSON" /> + <keyword name="LexerJSON (Constructor)" id="LexerJSON (Constructor)" ref="eric6.QScintilla.Lexers.LexerJSON.html#LexerJSON.__init__" /> + <keyword name="LexerJSON (Module)" id="LexerJSON (Module)" ref="eric6.QScintilla.Lexers.LexerJSON.html" /> + <keyword name="LexerJSON.defaultKeywords" id="LexerJSON.defaultKeywords" ref="eric6.QScintilla.Lexers.LexerJSON.html#LexerJSON.defaultKeywords" /> + <keyword name="LexerJSON.initProperties" id="LexerJSON.initProperties" ref="eric6.QScintilla.Lexers.LexerJSON.html#LexerJSON.initProperties" /> + <keyword name="LexerJSON.isCommentStyle" id="LexerJSON.isCommentStyle" ref="eric6.QScintilla.Lexers.LexerJSON.html#LexerJSON.isCommentStyle" /> + <keyword name="LexerJSON.isStringStyle" id="LexerJSON.isStringStyle" ref="eric6.QScintilla.Lexers.LexerJSON.html#LexerJSON.isStringStyle" /> + <keyword name="LexerJSON.maximumKeywordSet" id="LexerJSON.maximumKeywordSet" ref="eric6.QScintilla.Lexers.LexerJSON.html#LexerJSON.maximumKeywordSet" /> <keyword name="LexerJava" id="LexerJava" ref="eric6.QScintilla.Lexers.LexerJava.html#LexerJava" /> <keyword name="LexerJava (Constructor)" id="LexerJava (Constructor)" ref="eric6.QScintilla.Lexers.LexerJava.html#LexerJava.__init__" /> <keyword name="LexerJava (Module)" id="LexerJava (Module)" ref="eric6.QScintilla.Lexers.LexerJava.html" /> @@ -9214,6 +9273,10 @@ <keyword name="LexerMakefile.defaultKeywords" id="LexerMakefile.defaultKeywords" ref="eric6.QScintilla.Lexers.LexerMakefile.html#LexerMakefile.defaultKeywords" /> <keyword name="LexerMakefile.isCommentStyle" id="LexerMakefile.isCommentStyle" ref="eric6.QScintilla.Lexers.LexerMakefile.html#LexerMakefile.isCommentStyle" /> <keyword name="LexerMakefile.isStringStyle" id="LexerMakefile.isStringStyle" ref="eric6.QScintilla.Lexers.LexerMakefile.html#LexerMakefile.isStringStyle" /> + <keyword name="LexerMarkdown" id="LexerMarkdown" ref="eric6.QScintilla.Lexers.LexerMarkdown.html#LexerMarkdown" /> + <keyword name="LexerMarkdown (Constructor)" id="LexerMarkdown (Constructor)" ref="eric6.QScintilla.Lexers.LexerMarkdown.html#LexerMarkdown.__init__" /> + <keyword name="LexerMarkdown (Module)" id="LexerMarkdown (Module)" ref="eric6.QScintilla.Lexers.LexerMarkdown.html" /> + <keyword name="LexerMarkdown.defaultKeywords" id="LexerMarkdown.defaultKeywords" ref="eric6.QScintilla.Lexers.LexerMarkdown.html#LexerMarkdown.defaultKeywords" /> <keyword name="LexerMatlab" id="LexerMatlab" ref="eric6.QScintilla.Lexers.LexerMatlab.html#LexerMatlab" /> <keyword name="LexerMatlab (Constructor)" id="LexerMatlab (Constructor)" ref="eric6.QScintilla.Lexers.LexerMatlab.html#LexerMatlab.__init__" /> <keyword name="LexerMatlab (Module)" id="LexerMatlab (Module)" ref="eric6.QScintilla.Lexers.LexerMatlab.html" /> @@ -9463,6 +9526,65 @@ <keyword name="LoginForm (Module)" id="LoginForm (Module)" ref="eric6.WebBrowser.Passwords.LoginForm.html" /> <keyword name="LoginForm.isValid" id="LoginForm.isValid" ref="eric6.Helpviewer.Passwords.LoginForm.html#LoginForm.isValid" /> <keyword name="LoginForm.isValid" id="LoginForm.isValid" ref="eric6.WebBrowser.Passwords.LoginForm.html#LoginForm.isValid" /> + <keyword name="MarkdownProvider" id="MarkdownProvider" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider" /> + <keyword name="MarkdownProvider (Constructor)" id="MarkdownProvider (Constructor)" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.__init__" /> + <keyword name="MarkdownProvider (Module)" id="MarkdownProvider (Module)" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html" /> + <keyword name="MarkdownProvider.__insertMarkup" id="MarkdownProvider.__insertMarkup" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.__insertMarkup" /> + <keyword name="MarkdownProvider.__makeList" id="MarkdownProvider.__makeList" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.__makeList" /> + <keyword name="MarkdownProvider.bold" id="MarkdownProvider.bold" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.bold" /> + <keyword name="MarkdownProvider.bulletedList" id="MarkdownProvider.bulletedList" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.bulletedList" /> + <keyword name="MarkdownProvider.code" id="MarkdownProvider.code" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.code" /> + <keyword name="MarkdownProvider.codeBlock" id="MarkdownProvider.codeBlock" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.codeBlock" /> + <keyword name="MarkdownProvider.hasBold" id="MarkdownProvider.hasBold" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.hasBold" /> + <keyword name="MarkdownProvider.hasBulletedList" id="MarkdownProvider.hasBulletedList" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.hasBulletedList" /> + <keyword name="MarkdownProvider.hasCode" id="MarkdownProvider.hasCode" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.hasCode" /> + <keyword name="MarkdownProvider.hasCodeBlock" id="MarkdownProvider.hasCodeBlock" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.hasCodeBlock" /> + <keyword name="MarkdownProvider.hasHyperlink" id="MarkdownProvider.hasHyperlink" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.hasHyperlink" /> + <keyword name="MarkdownProvider.hasImage" id="MarkdownProvider.hasImage" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.hasImage" /> + <keyword name="MarkdownProvider.hasItalic" id="MarkdownProvider.hasItalic" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.hasItalic" /> + <keyword name="MarkdownProvider.hasLine" id="MarkdownProvider.hasLine" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.hasLine" /> + <keyword name="MarkdownProvider.hasNumberedList" id="MarkdownProvider.hasNumberedList" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.hasNumberedList" /> + <keyword name="MarkdownProvider.hasQuote" id="MarkdownProvider.hasQuote" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.hasQuote" /> + <keyword name="MarkdownProvider.hasStrikethrough" id="MarkdownProvider.hasStrikethrough" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.hasStrikethrough" /> + <keyword name="MarkdownProvider.header" id="MarkdownProvider.header" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.header" /> + <keyword name="MarkdownProvider.headerLevels" id="MarkdownProvider.headerLevels" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.headerLevels" /> + <keyword name="MarkdownProvider.hyperlink" id="MarkdownProvider.hyperlink" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.hyperlink" /> + <keyword name="MarkdownProvider.image" id="MarkdownProvider.image" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.image" /> + <keyword name="MarkdownProvider.italic" id="MarkdownProvider.italic" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.italic" /> + <keyword name="MarkdownProvider.kind" id="MarkdownProvider.kind" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.kind" /> + <keyword name="MarkdownProvider.line" id="MarkdownProvider.line" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.line" /> + <keyword name="MarkdownProvider.numberedList" id="MarkdownProvider.numberedList" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.numberedList" /> + <keyword name="MarkdownProvider.quote" id="MarkdownProvider.quote" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.quote" /> + <keyword name="MarkdownProvider.strikethrough" id="MarkdownProvider.strikethrough" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.strikethrough" /> + <keyword name="MarkupBase" id="MarkupBase" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase" /> + <keyword name="MarkupBase (Constructor)" id="MarkupBase (Constructor)" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.__init__" /> + <keyword name="MarkupBase (Module)" id="MarkupBase (Module)" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html" /> + <keyword name="MarkupBase.bold" id="MarkupBase.bold" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.bold" /> + <keyword name="MarkupBase.bulletedList" id="MarkupBase.bulletedList" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.bulletedList" /> + <keyword name="MarkupBase.code" id="MarkupBase.code" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.code" /> + <keyword name="MarkupBase.codeBlock" id="MarkupBase.codeBlock" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.codeBlock" /> + <keyword name="MarkupBase.hasBold" id="MarkupBase.hasBold" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.hasBold" /> + <keyword name="MarkupBase.hasBulletedList" id="MarkupBase.hasBulletedList" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.hasBulletedList" /> + <keyword name="MarkupBase.hasCode" id="MarkupBase.hasCode" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.hasCode" /> + <keyword name="MarkupBase.hasCodeBlock" id="MarkupBase.hasCodeBlock" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.hasCodeBlock" /> + <keyword name="MarkupBase.hasHyperlink" id="MarkupBase.hasHyperlink" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.hasHyperlink" /> + <keyword name="MarkupBase.hasImage" id="MarkupBase.hasImage" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.hasImage" /> + <keyword name="MarkupBase.hasItalic" id="MarkupBase.hasItalic" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.hasItalic" /> + <keyword name="MarkupBase.hasLine" id="MarkupBase.hasLine" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.hasLine" /> + <keyword name="MarkupBase.hasNumberedList" id="MarkupBase.hasNumberedList" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.hasNumberedList" /> + <keyword name="MarkupBase.hasQuote" id="MarkupBase.hasQuote" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.hasQuote" /> + <keyword name="MarkupBase.hasStrikethrough" id="MarkupBase.hasStrikethrough" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.hasStrikethrough" /> + <keyword name="MarkupBase.header" id="MarkupBase.header" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.header" /> + <keyword name="MarkupBase.headerLevels" id="MarkupBase.headerLevels" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.headerLevels" /> + <keyword name="MarkupBase.hyperlink" id="MarkupBase.hyperlink" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.hyperlink" /> + <keyword name="MarkupBase.image" id="MarkupBase.image" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.image" /> + <keyword name="MarkupBase.italic" id="MarkupBase.italic" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.italic" /> + <keyword name="MarkupBase.kind" id="MarkupBase.kind" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.kind" /> + <keyword name="MarkupBase.line" id="MarkupBase.line" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.line" /> + <keyword name="MarkupBase.numberedList" id="MarkupBase.numberedList" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.numberedList" /> + <keyword name="MarkupBase.quote" id="MarkupBase.quote" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.quote" /> + <keyword name="MarkupBase.strikethrough" id="MarkupBase.strikethrough" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.strikethrough" /> + <keyword name="MarkupProviders (Package)" id="MarkupProviders (Package)" ref="index-eric6.QScintilla.MarkupProviders.html" /> <keyword name="MasterPasswordEntryDialog" id="MasterPasswordEntryDialog" ref="eric6.Preferences.ConfigurationPages.MasterPasswordEntryDialog.html#MasterPasswordEntryDialog" /> <keyword name="MasterPasswordEntryDialog (Constructor)" id="MasterPasswordEntryDialog (Constructor)" ref="eric6.Preferences.ConfigurationPages.MasterPasswordEntryDialog.html#MasterPasswordEntryDialog.__init__" /> <keyword name="MasterPasswordEntryDialog (Module)" id="MasterPasswordEntryDialog (Module)" ref="eric6.Preferences.ConfigurationPages.MasterPasswordEntryDialog.html" /> @@ -10738,7 +10860,6 @@ <keyword name="PreviewProcessingThread.__getHtml" id="PreviewProcessingThread.__getHtml" ref="eric6.UI.Previewers.PreviewerHTML.html#PreviewProcessingThread.__getHtml" /> <keyword name="PreviewProcessingThread.__processSSI" id="PreviewProcessingThread.__processSSI" ref="eric6.UI.Previewers.PreviewerHTML.html#PreviewProcessingThread.__processSSI" /> <keyword name="PreviewProcessingThread.process" id="PreviewProcessingThread.process" ref="eric6.UI.Previewers.PreviewerHTML.html#PreviewProcessingThread.process" /> - <keyword name="PreviewProcessingThread.replace" id="PreviewProcessingThread.replace" ref="eric6.UI.Previewers.PreviewerHTML.html#PreviewProcessingThread.replace" /> <keyword name="PreviewProcessingThread.run" id="PreviewProcessingThread.run" ref="eric6.UI.Previewers.PreviewerHTML.html#PreviewProcessingThread.run" /> <keyword name="Previewer" id="Previewer" ref="eric6.UI.Previewer.html#Previewer" /> <keyword name="Previewer (Constructor)" id="Previewer (Constructor)" ref="eric6.UI.Previewer.html#Previewer.__init__" /> @@ -11759,6 +11880,8 @@ <keyword name="QtHelpDocumentationDialog.on_addPluginButton_clicked" id="QtHelpDocumentationDialog.on_addPluginButton_clicked" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.html#QtHelpDocumentationDialog.on_addPluginButton_clicked" /> <keyword name="QtHelpDocumentationDialog.on_documentsList_itemSelectionChanged" id="QtHelpDocumentationDialog.on_documentsList_itemSelectionChanged" ref="eric6.Helpviewer.QtHelpDocumentationDialog.html#QtHelpDocumentationDialog.on_documentsList_itemSelectionChanged" /> <keyword name="QtHelpDocumentationDialog.on_documentsList_itemSelectionChanged" id="QtHelpDocumentationDialog.on_documentsList_itemSelectionChanged" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.html#QtHelpDocumentationDialog.on_documentsList_itemSelectionChanged" /> + <keyword name="QtHelpDocumentationDialog.on_managePluginButton_clicked" id="QtHelpDocumentationDialog.on_managePluginButton_clicked" ref="eric6.Helpviewer.QtHelpDocumentationDialog.html#QtHelpDocumentationDialog.on_managePluginButton_clicked" /> + <keyword name="QtHelpDocumentationDialog.on_managePluginButton_clicked" id="QtHelpDocumentationDialog.on_managePluginButton_clicked" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.html#QtHelpDocumentationDialog.on_managePluginButton_clicked" /> <keyword name="QtHelpDocumentationDialog.on_removeButton_clicked" id="QtHelpDocumentationDialog.on_removeButton_clicked" ref="eric6.Helpviewer.QtHelpDocumentationDialog.html#QtHelpDocumentationDialog.on_removeButton_clicked" /> <keyword name="QtHelpDocumentationDialog.on_removeButton_clicked" id="QtHelpDocumentationDialog.on_removeButton_clicked" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.html#QtHelpDocumentationDialog.on_removeButton_clicked" /> <keyword name="QtHelpDocumentationSelectionDialog" id="QtHelpDocumentationSelectionDialog" ref="eric6.Helpviewer.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog" /> @@ -11767,8 +11890,18 @@ <keyword name="QtHelpDocumentationSelectionDialog (Constructor)" id="QtHelpDocumentationSelectionDialog (Constructor)" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.__init__" /> <keyword name="QtHelpDocumentationSelectionDialog (Module)" id="QtHelpDocumentationSelectionDialog (Module)" ref="eric6.Helpviewer.QtHelpDocumentationSelectionDialog.html" /> <keyword name="QtHelpDocumentationSelectionDialog (Module)" id="QtHelpDocumentationSelectionDialog (Module)" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.html" /> + <keyword name="QtHelpDocumentationSelectionDialog.__deleteCategory" id="QtHelpDocumentationSelectionDialog.__deleteCategory" ref="eric6.Helpviewer.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.__deleteCategory" /> + <keyword name="QtHelpDocumentationSelectionDialog.__deleteCategory" id="QtHelpDocumentationSelectionDialog.__deleteCategory" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.__deleteCategory" /> <keyword name="QtHelpDocumentationSelectionDialog.getData" id="QtHelpDocumentationSelectionDialog.getData" ref="eric6.Helpviewer.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.getData" /> <keyword name="QtHelpDocumentationSelectionDialog.getData" id="QtHelpDocumentationSelectionDialog.getData" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.getData" /> + <keyword name="QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked" id="QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked" ref="eric6.Helpviewer.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked" /> + <keyword name="QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked" id="QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked" /> + <keyword name="QtHelpDocumentationSelectionDialog.on_deleteButton_clicked" id="QtHelpDocumentationSelectionDialog.on_deleteButton_clicked" ref="eric6.Helpviewer.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.on_deleteButton_clicked" /> + <keyword name="QtHelpDocumentationSelectionDialog.on_deleteButton_clicked" id="QtHelpDocumentationSelectionDialog.on_deleteButton_clicked" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.on_deleteButton_clicked" /> + <keyword name="QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked" id="QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked" ref="eric6.Helpviewer.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked" /> + <keyword name="QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked" id="QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked" /> + <keyword name="QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged" id="QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged" ref="eric6.Helpviewer.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged" /> + <keyword name="QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged" id="QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged" /> <keyword name="QtHelpFiltersDialog" id="QtHelpFiltersDialog" ref="eric6.Helpviewer.QtHelpFiltersDialog.html#QtHelpFiltersDialog" /> <keyword name="QtHelpFiltersDialog" id="QtHelpFiltersDialog" ref="eric6.WebBrowser.QtHelp.QtHelpFiltersDialog.html#QtHelpFiltersDialog" /> <keyword name="QtHelpFiltersDialog (Constructor)" id="QtHelpFiltersDialog (Constructor)" ref="eric6.Helpviewer.QtHelpFiltersDialog.html#QtHelpFiltersDialog.__init__" /> @@ -11971,6 +12104,34 @@ <keyword name="RemoveBookmarksCommand.undo" id="RemoveBookmarksCommand.undo" ref="eric6.Helpviewer.Bookmarks.BookmarksManager.html#RemoveBookmarksCommand.undo" /> <keyword name="RemoveBookmarksCommand.undo" id="RemoveBookmarksCommand.undo" ref="eric6.WebBrowser.Bookmarks.BookmarksManager.html#RemoveBookmarksCommand.undo" /> <keyword name="RepositoryInfoDialog (Module)" id="RepositoryInfoDialog (Module)" ref="eric6.VCS.RepositoryInfoDialog.html" /> + <keyword name="RestructuredTextProvider" id="RestructuredTextProvider" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider" /> + <keyword name="RestructuredTextProvider (Constructor)" id="RestructuredTextProvider (Constructor)" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.__init__" /> + <keyword name="RestructuredTextProvider (Module)" id="RestructuredTextProvider (Module)" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html" /> + <keyword name="RestructuredTextProvider.__insertMarkup" id="RestructuredTextProvider.__insertMarkup" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.__insertMarkup" /> + <keyword name="RestructuredTextProvider.__makeList" id="RestructuredTextProvider.__makeList" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.__makeList" /> + <keyword name="RestructuredTextProvider.bold" id="RestructuredTextProvider.bold" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.bold" /> + <keyword name="RestructuredTextProvider.bulletedList" id="RestructuredTextProvider.bulletedList" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.bulletedList" /> + <keyword name="RestructuredTextProvider.code" id="RestructuredTextProvider.code" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.code" /> + <keyword name="RestructuredTextProvider.codeBlock" id="RestructuredTextProvider.codeBlock" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.codeBlock" /> + <keyword name="RestructuredTextProvider.hasBold" id="RestructuredTextProvider.hasBold" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.hasBold" /> + <keyword name="RestructuredTextProvider.hasBulletedList" id="RestructuredTextProvider.hasBulletedList" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.hasBulletedList" /> + <keyword name="RestructuredTextProvider.hasCode" id="RestructuredTextProvider.hasCode" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.hasCode" /> + <keyword name="RestructuredTextProvider.hasCodeBlock" id="RestructuredTextProvider.hasCodeBlock" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.hasCodeBlock" /> + <keyword name="RestructuredTextProvider.hasHyperlink" id="RestructuredTextProvider.hasHyperlink" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.hasHyperlink" /> + <keyword name="RestructuredTextProvider.hasImage" id="RestructuredTextProvider.hasImage" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.hasImage" /> + <keyword name="RestructuredTextProvider.hasItalic" id="RestructuredTextProvider.hasItalic" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.hasItalic" /> + <keyword name="RestructuredTextProvider.hasLine" id="RestructuredTextProvider.hasLine" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.hasLine" /> + <keyword name="RestructuredTextProvider.hasNumberedList" id="RestructuredTextProvider.hasNumberedList" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.hasNumberedList" /> + <keyword name="RestructuredTextProvider.hasQuote" id="RestructuredTextProvider.hasQuote" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.hasQuote" /> + <keyword name="RestructuredTextProvider.header" id="RestructuredTextProvider.header" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.header" /> + <keyword name="RestructuredTextProvider.headerLevels" id="RestructuredTextProvider.headerLevels" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.headerLevels" /> + <keyword name="RestructuredTextProvider.hyperlink" id="RestructuredTextProvider.hyperlink" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.hyperlink" /> + <keyword name="RestructuredTextProvider.image" id="RestructuredTextProvider.image" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.image" /> + <keyword name="RestructuredTextProvider.italic" id="RestructuredTextProvider.italic" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.italic" /> + <keyword name="RestructuredTextProvider.kind" id="RestructuredTextProvider.kind" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.kind" /> + <keyword name="RestructuredTextProvider.line" id="RestructuredTextProvider.line" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.line" /> + <keyword name="RestructuredTextProvider.numberedList" id="RestructuredTextProvider.numberedList" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.numberedList" /> + <keyword name="RestructuredTextProvider.quote" id="RestructuredTextProvider.quote" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.quote" /> <keyword name="SafariImporter" id="SafariImporter" ref="eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.html#SafariImporter" /> <keyword name="SafariImporter" id="SafariImporter" ref="eric6.WebBrowser.Bookmarks.BookmarksImporters.SafariImporter.html#SafariImporter" /> <keyword name="SafariImporter (Constructor)" id="SafariImporter (Constructor)" ref="eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.html#SafariImporter.__init__" /> @@ -12834,8 +12995,6 @@ <keyword name="Subversion.vcsInit" id="Subversion.vcsInit" ref="eric6.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.vcsInit" /> <keyword name="Subversion.vcsInitConfig" id="Subversion.vcsInitConfig" ref="eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.vcsInitConfig" /> <keyword name="Subversion.vcsInitConfig" id="Subversion.vcsInitConfig" ref="eric6.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.vcsInitConfig" /> - <keyword name="Subversion.vcsLog" id="Subversion.vcsLog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.vcsLog" /> - <keyword name="Subversion.vcsLog" id="Subversion.vcsLog" ref="eric6.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.vcsLog" /> <keyword name="Subversion.vcsLogBrowser" id="Subversion.vcsLogBrowser" ref="eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.vcsLogBrowser" /> <keyword name="Subversion.vcsLogBrowser" id="Subversion.vcsLogBrowser" ref="eric6.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.vcsLogBrowser" /> <keyword name="Subversion.vcsMerge" id="Subversion.vcsMerge" ref="eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.vcsMerge" /> @@ -13075,6 +13234,7 @@ <keyword name="SvnLogBrowserDialog (Constructor)" id="SvnLogBrowserDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.__init__" /> <keyword name="SvnLogBrowserDialog (Module)" id="SvnLogBrowserDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html" /> <keyword name="SvnLogBrowserDialog (Module)" id="SvnLogBrowserDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html" /> + <keyword name="SvnLogBrowserDialog.__addFinishCallback" id="SvnLogBrowserDialog.__addFinishCallback" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.__addFinishCallback" /> <keyword name="SvnLogBrowserDialog.__diffRevisions" id="SvnLogBrowserDialog.__diffRevisions" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.__diffRevisions" /> <keyword name="SvnLogBrowserDialog.__diffRevisions" id="SvnLogBrowserDialog.__diffRevisions" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.__diffRevisions" /> <keyword name="SvnLogBrowserDialog.__filterLogs" id="SvnLogBrowserDialog.__filterLogs" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.__filterLogs" /> @@ -13114,6 +13274,8 @@ <keyword name="SvnLogBrowserDialog.on_diffPreviousButton_clicked" id="SvnLogBrowserDialog.on_diffPreviousButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_diffPreviousButton_clicked" /> <keyword name="SvnLogBrowserDialog.on_diffRevisionsButton_clicked" id="SvnLogBrowserDialog.on_diffRevisionsButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_diffRevisionsButton_clicked" /> <keyword name="SvnLogBrowserDialog.on_diffRevisionsButton_clicked" id="SvnLogBrowserDialog.on_diffRevisionsButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_diffRevisionsButton_clicked" /> + <keyword name="SvnLogBrowserDialog.on_downButton_clicked" id="SvnLogBrowserDialog.on_downButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_downButton_clicked" /> + <keyword name="SvnLogBrowserDialog.on_downButton_clicked" id="SvnLogBrowserDialog.on_downButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_downButton_clicked" /> <keyword name="SvnLogBrowserDialog.on_fieldCombo_activated" id="SvnLogBrowserDialog.on_fieldCombo_activated" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_fieldCombo_activated" /> <keyword name="SvnLogBrowserDialog.on_fieldCombo_activated" id="SvnLogBrowserDialog.on_fieldCombo_activated" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_fieldCombo_activated" /> <keyword name="SvnLogBrowserDialog.on_fromDate_dateChanged" id="SvnLogBrowserDialog.on_fromDate_dateChanged" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_fromDate_dateChanged" /> @@ -13133,31 +13295,12 @@ <keyword name="SvnLogBrowserDialog.on_stopCheckBox_clicked" id="SvnLogBrowserDialog.on_stopCheckBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_stopCheckBox_clicked" /> <keyword name="SvnLogBrowserDialog.on_toDate_dateChanged" id="SvnLogBrowserDialog.on_toDate_dateChanged" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_toDate_dateChanged" /> <keyword name="SvnLogBrowserDialog.on_toDate_dateChanged" id="SvnLogBrowserDialog.on_toDate_dateChanged" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_toDate_dateChanged" /> + <keyword name="SvnLogBrowserDialog.on_upButton_clicked" id="SvnLogBrowserDialog.on_upButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_upButton_clicked" /> + <keyword name="SvnLogBrowserDialog.on_upButton_clicked" id="SvnLogBrowserDialog.on_upButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_upButton_clicked" /> <keyword name="SvnLogBrowserDialog.show" id="SvnLogBrowserDialog.show" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.show" /> <keyword name="SvnLogBrowserDialog.show" id="SvnLogBrowserDialog.show" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.show" /> <keyword name="SvnLogBrowserDialog.start" id="SvnLogBrowserDialog.start" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.start" /> <keyword name="SvnLogBrowserDialog.start" id="SvnLogBrowserDialog.start" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.start" /> - <keyword name="SvnLogDialog" id="SvnLogDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html#SvnLogDialog" /> - <keyword name="SvnLogDialog" id="SvnLogDialog" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog" /> - <keyword name="SvnLogDialog (Constructor)" id="SvnLogDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html#SvnLogDialog.__init__" /> - <keyword name="SvnLogDialog (Constructor)" id="SvnLogDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.__init__" /> - <keyword name="SvnLogDialog (Module)" id="SvnLogDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html" /> - <keyword name="SvnLogDialog (Module)" id="SvnLogDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html" /> - <keyword name="SvnLogDialog.__finish" id="SvnLogDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html#SvnLogDialog.__finish" /> - <keyword name="SvnLogDialog.__procFinished" id="SvnLogDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.__procFinished" /> - <keyword name="SvnLogDialog.__readStderr" id="SvnLogDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.__readStderr" /> - <keyword name="SvnLogDialog.__readStdout" id="SvnLogDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.__readStdout" /> - <keyword name="SvnLogDialog.__showError" id="SvnLogDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html#SvnLogDialog.__showError" /> - <keyword name="SvnLogDialog.__sourceChanged" id="SvnLogDialog.__sourceChanged" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html#SvnLogDialog.__sourceChanged" /> - <keyword name="SvnLogDialog.__sourceChanged" id="SvnLogDialog.__sourceChanged" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.__sourceChanged" /> - <keyword name="SvnLogDialog.closeEvent" id="SvnLogDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.closeEvent" /> - <keyword name="SvnLogDialog.keyPressEvent" id="SvnLogDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.keyPressEvent" /> - <keyword name="SvnLogDialog.on_buttonBox_clicked" id="SvnLogDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html#SvnLogDialog.on_buttonBox_clicked" /> - <keyword name="SvnLogDialog.on_input_returnPressed" id="SvnLogDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.on_input_returnPressed" /> - <keyword name="SvnLogDialog.on_passwordCheckBox_toggled" id="SvnLogDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.on_passwordCheckBox_toggled" /> - <keyword name="SvnLogDialog.on_sendButton_clicked" id="SvnLogDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.on_sendButton_clicked" /> - <keyword name="SvnLogDialog.start" id="SvnLogDialog.start" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html#SvnLogDialog.start" /> - <keyword name="SvnLogDialog.start" id="SvnLogDialog.start" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.start" /> <keyword name="SvnLoginDialog" id="SvnLoginDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.html#SvnLoginDialog" /> <keyword name="SvnLoginDialog (Constructor)" id="SvnLoginDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.html#SvnLoginDialog.__init__" /> <keyword name="SvnLoginDialog (Module)" id="SvnLoginDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.html" /> @@ -14963,7 +15106,6 @@ <keyword name="VersionControl.vcsImport" id="VersionControl.vcsImport" ref="eric6.VCS.VersionControl.html#VersionControl.vcsImport" /> <keyword name="VersionControl.vcsInit" id="VersionControl.vcsInit" ref="eric6.VCS.VersionControl.html#VersionControl.vcsInit" /> <keyword name="VersionControl.vcsInitConfig" id="VersionControl.vcsInitConfig" ref="eric6.VCS.VersionControl.html#VersionControl.vcsInitConfig" /> - <keyword name="VersionControl.vcsLog" id="VersionControl.vcsLog" ref="eric6.VCS.VersionControl.html#VersionControl.vcsLog" /> <keyword name="VersionControl.vcsLogBrowser" id="VersionControl.vcsLogBrowser" ref="eric6.VCS.VersionControl.html#VersionControl.vcsLogBrowser" /> <keyword name="VersionControl.vcsMerge" id="VersionControl.vcsMerge" ref="eric6.VCS.VersionControl.html#VersionControl.vcsMerge" /> <keyword name="VersionControl.vcsMove" id="VersionControl.vcsMove" ref="eric6.VCS.VersionControl.html#VersionControl.vcsMove" /> @@ -16130,6 +16272,7 @@ <keyword name="amendConfig" id="amendConfig" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnUtilities.html#amendConfig" /> <keyword name="analyze" id="analyze" ref="eric6.DataViews.CodeMetrics.html#analyze" /> <keyword name="append_PKCS7_padding" id="append_PKCS7_padding" ref="eric6.Utilities.crypto.py3AES.html#append_PKCS7_padding" /> + <keyword name="bare_except" id="bare_except" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#bare_except" /> <keyword name="batchCheck" id="batchCheck" ref="eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.html#batchCheck" /> <keyword name="binplistlib (Module)" id="binplistlib (Module)" ref="eric6.Utilities.binplistlib.html" /> <keyword name="blank_lines" id="blank_lines" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#blank_lines" /> @@ -16431,6 +16574,7 @@ <keyword name="getIrc" id="getIrc" ref="eric6.Preferences.__init__.html#getIrc" /> <keyword name="getLanguageIcon" id="getLanguageIcon" ref="eric6.QScintilla.Lexers.__init__.html#getLanguageIcon" /> <keyword name="getLexer" id="getLexer" ref="eric6.QScintilla.Lexers.__init__.html#getLexer" /> + <keyword name="getMarkupProvider" id="getMarkupProvider" ref="eric6.QScintilla.MarkupProviders.__init__.html#getMarkupProvider" /> <keyword name="getMultiProject" id="getMultiProject" ref="eric6.Preferences.__init__.html#getMultiProject" /> <keyword name="getOpenFileFiltersList" id="getOpenFileFiltersList" ref="eric6.QScintilla.Lexers.__init__.html#getOpenFileFiltersList" /> <keyword name="getOpenFileName" id="getOpenFileName" ref="eric6.E5Gui.E5FileDialog.html#getOpenFileName" /> @@ -17304,9 +17448,7 @@ <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html</file> - <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html</file> - <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog.html</file> @@ -17382,7 +17524,6 @@ <file>eric6.Plugins.VcsPlugins.vcsPySvn.SvnDiffHighlighter.html</file> <file>eric6.Plugins.VcsPlugins.vcsPySvn.SvnInfoDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html</file> - <file>eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog.html</file> @@ -17414,7 +17555,6 @@ <file>eric6.Plugins.VcsPlugins.vcsSubversion.SvnDiffDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsSubversion.SvnDiffHighlighter.html</file> <file>eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html</file> - <file>eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog.html</file> @@ -17551,6 +17691,7 @@ <file>eric6.QScintilla.APIsManager.html</file> <file>eric6.QScintilla.Editor.html</file> <file>eric6.QScintilla.EditorAssembly.html</file> + <file>eric6.QScintilla.EditorButtonsWidget.html</file> <file>eric6.QScintilla.EditorMarkerMap.html</file> <file>eric6.QScintilla.Exporters.ExporterBase.html</file> <file>eric6.QScintilla.Exporters.ExporterHTML.html</file> @@ -17576,10 +17717,12 @@ <file>eric6.QScintilla.Lexers.LexerFortran77.html</file> <file>eric6.QScintilla.Lexers.LexerHTML.html</file> <file>eric6.QScintilla.Lexers.LexerIDL.html</file> + <file>eric6.QScintilla.Lexers.LexerJSON.html</file> <file>eric6.QScintilla.Lexers.LexerJava.html</file> <file>eric6.QScintilla.Lexers.LexerJavaScript.html</file> <file>eric6.QScintilla.Lexers.LexerLua.html</file> <file>eric6.QScintilla.Lexers.LexerMakefile.html</file> + <file>eric6.QScintilla.Lexers.LexerMarkdown.html</file> <file>eric6.QScintilla.Lexers.LexerMatlab.html</file> <file>eric6.QScintilla.Lexers.LexerOctave.html</file> <file>eric6.QScintilla.Lexers.LexerPO.html</file> @@ -17599,6 +17742,13 @@ <file>eric6.QScintilla.Lexers.LexerXML.html</file> <file>eric6.QScintilla.Lexers.LexerYAML.html</file> <file>eric6.QScintilla.Lexers.__init__.html</file> + <file>eric6.QScintilla.MarkupProviders.HtmlProvider.html</file> + <file>eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html</file> + <file>eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html</file> + <file>eric6.QScintilla.MarkupProviders.MarkdownProvider.html</file> + <file>eric6.QScintilla.MarkupProviders.MarkupBase.html</file> + <file>eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html</file> + <file>eric6.QScintilla.MarkupProviders.__init__.html</file> <file>eric6.QScintilla.MiniEditor.html</file> <file>eric6.QScintilla.Printer.html</file> <file>eric6.QScintilla.QsciScintillaCompat.html</file> @@ -17993,6 +18143,7 @@ <file>index-eric6.PyUnit.html</file> <file>index-eric6.QScintilla.Exporters.html</file> <file>index-eric6.QScintilla.Lexers.html</file> + <file>index-eric6.QScintilla.MarkupProviders.html</file> <file>index-eric6.QScintilla.TypingCompleters.html</file> <file>index-eric6.QScintilla.html</file> <file>index-eric6.Snapshot.html</file>
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.Helpviewer.QtHelpDocumentationDialog.html --- a/Documentation/Source/eric6.Helpviewer.QtHelpDocumentationDialog.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.Helpviewer.QtHelpDocumentationDialog.html Fri Feb 03 19:20:59 2017 +0100 @@ -78,6 +78,9 @@ <td><a href="#QtHelpDocumentationDialog.on_documentsList_itemSelectionChanged">on_documentsList_itemSelectionChanged</a></td> <td>Private slot handling a change of the documents selection.</td> </tr><tr> +<td><a href="#QtHelpDocumentationDialog.on_managePluginButton_clicked">on_managePluginButton_clicked</a></td> +<td>Private slot to manage the QtHelp documents provided by plug-ins.</td> +</tr><tr> <td><a href="#QtHelpDocumentationDialog.on_removeButton_clicked">on_removeButton_clicked</a></td> <td>Private slot to remove a document from the help database.</td> </tr> @@ -145,6 +148,11 @@ <b>on_documentsList_itemSelectionChanged</b>(<i></i>) <p> Private slot handling a change of the documents selection. +</p><a NAME="QtHelpDocumentationDialog.on_managePluginButton_clicked" ID="QtHelpDocumentationDialog.on_managePluginButton_clicked"></a> +<h4>QtHelpDocumentationDialog.on_managePluginButton_clicked</h4> +<b>on_managePluginButton_clicked</b>(<i></i>) +<p> + Private slot to manage the QtHelp documents provided by plug-ins. </p><a NAME="QtHelpDocumentationDialog.on_removeButton_clicked" ID="QtHelpDocumentationDialog.on_removeButton_clicked"></a> <h4>QtHelpDocumentationDialog.on_removeButton_clicked</h4> <b>on_removeButton_clicked</b>(<i></i>)
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.Helpviewer.QtHelpDocumentationSelectionDialog.html --- a/Documentation/Source/eric6.Helpviewer.QtHelpDocumentationSelectionDialog.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.Helpviewer.QtHelpDocumentationSelectionDialog.html Fri Feb 03 19:20:59 2017 +0100 @@ -50,7 +50,7 @@ QDialog, Ui_QtHelpDocumentationSelectionDialog <h3>Class Attributes</h3> <table> -<tr><td>None</td></tr> +<tr><td>AddMode</td></tr><tr><td>ManageMode</td></tr> </table> <h3>Class Methods</h3> <table> @@ -62,8 +62,23 @@ <td><a href="#QtHelpDocumentationSelectionDialog.__init__">QtHelpDocumentationSelectionDialog</a></td> <td>Constructor</td> </tr><tr> +<td><a href="#QtHelpDocumentationSelectionDialog.__deleteCategory">__deleteCategory</a></td> +<td>Private method to delete a category.</td> +</tr><tr> <td><a href="#QtHelpDocumentationSelectionDialog.getData">getData</a></td> <td>Public method to retrieve the selected help documents.</td> +</tr><tr> +<td><a href="#QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked">on_deleteAllButton_clicked</a></td> +<td>Private slot to delete all documentation sets.</td> +</tr><tr> +<td><a href="#QtHelpDocumentationSelectionDialog.on_deleteButton_clicked">on_deleteButton_clicked</a></td> +<td>Private slot to delete the selected documentation sets.</td> +</tr><tr> +<td><a href="#QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked">on_deleteCategoryButton_clicked</a></td> +<td>Private slot to delete the selected documentation set categories.</td> +</tr><tr> +<td><a href="#QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged">on_documentationList_itemSelectionChanged</a></td> +<td>Private slot handling the selection of items.</td> </tr> </table> <h3>Static Methods</h3> @@ -72,7 +87,7 @@ </table> <a NAME="QtHelpDocumentationSelectionDialog.__init__" ID="QtHelpDocumentationSelectionDialog.__init__"></a> <h4>QtHelpDocumentationSelectionDialog (Constructor)</h4> -<b>QtHelpDocumentationSelectionDialog</b>(<i>helpDocuments, parent=None</i>) +<b>QtHelpDocumentationSelectionDialog</b>(<i>helpDocuments, mode, parent=None</i>) <p> Constructor </p><dl> @@ -80,10 +95,23 @@ <dd> dictionary containing the lists of help documents to be shown +</dd><dt><i>mode</i> (str)</dt> +<dd> +mode of the dialog </dd><dt><i>parent</i> (QWidget)</dt> <dd> reference to the parent widget </dd> +</dl><a NAME="QtHelpDocumentationSelectionDialog.__deleteCategory" ID="QtHelpDocumentationSelectionDialog.__deleteCategory"></a> +<h4>QtHelpDocumentationSelectionDialog.__deleteCategory</h4> +<b>__deleteCategory</b>(<i>category</i>) +<p> + Private method to delete a category. +</p><dl> +<dt><i>category</i> (QTreeWidgetItem)</dt> +<dd> +reference to the category item +</dd> </dl><a NAME="QtHelpDocumentationSelectionDialog.getData" ID="QtHelpDocumentationSelectionDialog.getData"></a> <h4>QtHelpDocumentationSelectionDialog.getData</h4> <b>getData</b>(<i></i>) @@ -99,7 +127,27 @@ <dd> list of str </dd> -</dl> +</dl><a NAME="QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked" ID="QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked"></a> +<h4>QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked</h4> +<b>on_deleteAllButton_clicked</b>(<i></i>) +<p> + Private slot to delete all documentation sets. +</p><a NAME="QtHelpDocumentationSelectionDialog.on_deleteButton_clicked" ID="QtHelpDocumentationSelectionDialog.on_deleteButton_clicked"></a> +<h4>QtHelpDocumentationSelectionDialog.on_deleteButton_clicked</h4> +<b>on_deleteButton_clicked</b>(<i></i>) +<p> + Private slot to delete the selected documentation sets. +</p><a NAME="QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked" ID="QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked"></a> +<h4>QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked</h4> +<b>on_deleteCategoryButton_clicked</b>(<i></i>) +<p> + Private slot to delete the selected documentation set categories. +</p><a NAME="QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged" ID="QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged"></a> +<h4>QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged</h4> +<b>on_documentationList_itemSelectionChanged</b>(<i></i>) +<p> + Private slot handling the selection of items. +</p> <div align="right"><a href="#top">Up</a></div> <hr /> </body></html> \ No newline at end of file
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html --- a/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html Fri Feb 03 19:20:59 2017 +0100 @@ -71,6 +71,9 @@ <td><a href="#ambiguous_identifier">ambiguous_identifier</a></td> <td>Never use the characters 'l', 'O', or 'I' as variable names.</td> </tr><tr> +<td><a href="#bare_except">bare_except</a></td> +<td>When catching exceptions, mention specific exceptions whenever possible.</td> +</tr><tr> <td><a href="#blank_lines">blank_lines</a></td> <td>Separate top-level function and class definitions with two blank lines.</td> </tr><tr> @@ -759,6 +762,18 @@ </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="bare_except" ID="bare_except"></a> +<h2>bare_except</h2> +<b>bare_except</b>(<i>logical_line, noqa</i>) +<p> +When catching exceptions, mention specific exceptions whenever possible. +</p><p> + Okay: except Exception: + Okay: except BaseException: + E722: except: +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="blank_lines" ID="blank_lines"></a> <h2>blank_lines</h2> <b>blank_lines</b>(<i>logical_line, blank_lines, indent_level, line_number, blank_before, previous_logical, previous_unindented_logical_line, previous_indent_level, lines</i>) @@ -1177,8 +1192,11 @@ Okay: # this is a comment\nimport os Okay: '''this is a module docstring'''\nimport os Okay: r'''this is a module docstring'''\nimport os - Okay: try:\n import x\nexcept:\n pass\nelse:\n pass\nimport y - Okay: try:\n import x\nexcept:\n pass\nfinally:\n pass\nimport y + Okay: + try:\n\timport x\nexcept ImportError:\n\tpass\nelse:\n\tpass\nimport y + Okay: + try:\n\timport x\nexcept ImportError:\n\tpass\nfinally:\n\tpass\nimport y +</p><p> E402: a=1\nimport os E402: 'One string'\n"Two string"\nimport os E402: a=1\nfrom sys import x
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html --- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Fri Feb 03 19:20:59 2017 +0100 @@ -63,6 +63,9 @@ <td><a href="#HgLogBrowserDialog.__actionMode">__actionMode</a></td> <td>Private method to get the selected action mode.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.__addFinishCallback">__addFinishCallback</a></td> +<td>Private method to add a method to be called once the process finished.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.__bookmarkActTriggered">__bookmarkActTriggered</a></td> <td>Private slot to bookmark the selected revision.</td> </tr><tr> @@ -111,6 +114,9 @@ <td><a href="#HgLogBrowserDialog.__getParents">__getParents</a></td> <td>Private method to get the parents of the currently viewed file/directory.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.__getRevisionOfTag">__getRevisionOfTag</a></td> +<td>Private method to get the revision of a tag.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.__graftActTriggered">__graftActTriggered</a></td> <td>Private slot to handle the Copy Changesets action.</td> </tr><tr> @@ -168,6 +174,9 @@ <td><a href="#HgLogBrowserDialog.__resortFiles">__resortFiles</a></td> <td>Private method to resort the changed files tree.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.__revisionClicked">__revisionClicked</a></td> +<td>Private slot to handle the anchorClicked signal of the changeset details pane.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.__showError">__showError</a></td> <td>Private slot to show some error.</td> </tr><tr> @@ -213,6 +222,9 @@ <td><a href="#HgLogBrowserDialog.on_diffRevisionsButton_clicked">on_diffRevisionsButton_clicked</a></td> <td>Private slot to handle the Compare Revisions button.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.on_downButton_clicked">on_downButton_clicked</a></td> +<td>Private slot to move the current item down one entry.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.on_fieldCombo_activated">on_fieldCombo_activated</a></td> <td>Private slot called, when a new filter field is selected.</td> </tr><tr> @@ -261,6 +273,9 @@ <td><a href="#HgLogBrowserDialog.on_toDate_dateChanged">on_toDate_dateChanged</a></td> <td>Private slot called, when the from date changes.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.on_upButton_clicked">on_upButton_clicked</a></td> +<td>Private slot to move the current item up one entry.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.show">show</a></td> <td>Public slot to show the dialog.</td> </tr><tr> @@ -298,6 +313,19 @@ <dd> selected action mode (string, one of filter or find) </dd> +</dl><a NAME="HgLogBrowserDialog.__addFinishCallback" ID="HgLogBrowserDialog.__addFinishCallback"></a> +<h4>HgLogBrowserDialog.__addFinishCallback</h4> +<b>__addFinishCallback</b>(<i>callback</i>) +<p> + Private method to add a method to be called once the process finished. +</p><p> + The callback methods are invoke in a FIFO style and are consumed. If + a callback method needs to be called again, it must be added again. +</p><dl> +<dt><i>callback</i> (function)</dt> +<dd> +callback method +</dd> </dl><a NAME="HgLogBrowserDialog.__bookmarkActTriggered" ID="HgLogBrowserDialog.__bookmarkActTriggered"></a> <h4>HgLogBrowserDialog.__bookmarkActTriggered</h4> <b>__bookmarkActTriggered</b>(<i></i>) @@ -447,7 +475,7 @@ </dd> </dl><a NAME="HgLogBrowserDialog.__generateLogItem" ID="HgLogBrowserDialog.__generateLogItem"></a> <h4>HgLogBrowserDialog.__generateLogItem</h4> -<b>__generateLogItem</b>(<i>author, date, message, revision, changedPaths, parents, branches, tags, phase, bookmarks=None</i>) +<b>__generateLogItem</b>(<i>author, date, message, revision, changedPaths, parents, branches, tags, phase, bookmarks, latestTag</i>) <p> Private method to generate a log tree entry. </p><dl> @@ -482,6 +510,10 @@ </dd><dt><i>bookmarks</i></dt> <dd> list of bookmarks (string) +</dd><dt><i>latestTag</i></dt> +<dd> +the latest tag(s) reachable from the changeset + (list of strings) </dd> </dl><dl> <dt>Returns:</dt> @@ -510,13 +542,16 @@ </dd> </dl><a NAME="HgLogBrowserDialog.__getLogEntries" ID="HgLogBrowserDialog.__getLogEntries"></a> <h4>HgLogBrowserDialog.__getLogEntries</h4> -<b>__getLogEntries</b>(<i>startRev=None</i>) +<b>__getLogEntries</b>(<i>startRev=None, noEntries=0</i>) <p> Private method to retrieve log entries from the repository. </p><dl> <dt><i>startRev</i></dt> <dd> revision number to start from (integer, string) +</dd><dt><i>noEntries=</i></dt> +<dd> +number of entries to get (0 = default) (int) </dd> </dl><a NAME="HgLogBrowserDialog.__getParents" ID="HgLogBrowserDialog.__getParents"></a> <h4>HgLogBrowserDialog.__getParents</h4> @@ -534,6 +569,26 @@ <dd> list of parent revisions (list of integers) </dd> +</dl><a NAME="HgLogBrowserDialog.__getRevisionOfTag" ID="HgLogBrowserDialog.__getRevisionOfTag"></a> +<h4>HgLogBrowserDialog.__getRevisionOfTag</h4> +<b>__getRevisionOfTag</b>(<i>tag</i>) +<p> + Private method to get the revision of a tag. +</p><dl> +<dt><i>tag</i> (str)</dt> +<dd> +tag name +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +tuple containing the revision and changeset ID +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, str) +</dd> </dl><a NAME="HgLogBrowserDialog.__graftActTriggered" ID="HgLogBrowserDialog.__graftActTriggered"></a> <h4>HgLogBrowserDialog.__graftActTriggered</h4> <b>__graftActTriggered</b>(<i></i>) @@ -659,7 +714,18 @@ <b>__resortFiles</b>(<i></i>) <p> Private method to resort the changed files tree. -</p><a NAME="HgLogBrowserDialog.__showError" ID="HgLogBrowserDialog.__showError"></a> +</p><a NAME="HgLogBrowserDialog.__revisionClicked" ID="HgLogBrowserDialog.__revisionClicked"></a> +<h4>HgLogBrowserDialog.__revisionClicked</h4> +<b>__revisionClicked</b>(<i>url</i>) +<p> + Private slot to handle the anchorClicked signal of the changeset + details pane. +</p><dl> +<dt><i>url</i> (QUrl)</dt> +<dd> +URL that was clicked +</dd> +</dl><a NAME="HgLogBrowserDialog.__showError" ID="HgLogBrowserDialog.__showError"></a> <h4>HgLogBrowserDialog.__showError</h4> <b>__showError</b>(<i>out</i>) <p> @@ -775,6 +841,11 @@ <b>on_diffRevisionsButton_clicked</b>(<i></i>) <p> Private slot to handle the Compare Revisions button. +</p><a NAME="HgLogBrowserDialog.on_downButton_clicked" ID="HgLogBrowserDialog.on_downButton_clicked"></a> +<h4>HgLogBrowserDialog.on_downButton_clicked</h4> +<b>on_downButton_clicked</b>(<i></i>) +<p> + Private slot to move the current item down one entry. </p><a NAME="HgLogBrowserDialog.on_fieldCombo_activated" ID="HgLogBrowserDialog.on_fieldCombo_activated"></a> <h4>HgLogBrowserDialog.on_fieldCombo_activated</h4> <b>on_fieldCombo_activated</b>(<i>txt</i>) @@ -898,14 +969,19 @@ <dd> new date (QDate) </dd> -</dl><a NAME="HgLogBrowserDialog.show" ID="HgLogBrowserDialog.show"></a> +</dl><a NAME="HgLogBrowserDialog.on_upButton_clicked" ID="HgLogBrowserDialog.on_upButton_clicked"></a> +<h4>HgLogBrowserDialog.on_upButton_clicked</h4> +<b>on_upButton_clicked</b>(<i></i>) +<p> + Private slot to move the current item up one entry. +</p><a NAME="HgLogBrowserDialog.show" ID="HgLogBrowserDialog.show"></a> <h4>HgLogBrowserDialog.show</h4> <b>show</b>(<i></i>) <p> Public slot to show the dialog. </p><a NAME="HgLogBrowserDialog.start" ID="HgLogBrowserDialog.start"></a> <h4>HgLogBrowserDialog.start</h4> -<b>start</b>(<i>fn, bundle=None, isFile=False</i>) +<b>start</b>(<i>fn, bundle=None, isFile=False, noEntries=0</i>) <p> Public slot to start the hg log command. </p><dl> @@ -919,6 +995,9 @@ <dd> flag indicating log for a file is to be shown (boolean) +</dd><dt><i>noEntries=</i></dt> +<dd> +number of entries to get (0 = default) (int) </dd> </dl> <div align="right"><a href="#top">Up</a></div>
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html --- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html Fri Jan 27 19:18:52 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,275 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog</title> -<meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> -</head> -<body><a NAME="top" ID="top"></a> -<h1>eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog</h1> -<p> -Module implementing a dialog to show the output of the hg log command process. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr> -<td><a href="#HgLogDialog">HgLogDialog</a></td> -<td>Class implementing a dialog to show the output of the hg log command process.</td> -</tr> -</table> -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> -<hr /><hr /> -<a NAME="HgLogDialog" ID="HgLogDialog"></a> -<h2>HgLogDialog</h2> -<p> - Class implementing a dialog to show the output of the hg log command - process. -</p><p> - The dialog is nonmodal. Clicking a link in the upper text pane shows - a diff of the revisions. -</p> -<h3>Derived from</h3> -QWidget, Ui_HgLogDialog -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Methods</h3> -<table> -<tr> -<td><a href="#HgLogDialog.__init__">HgLogDialog</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#HgLogDialog.__finish">__finish</a></td> -<td>Private slot called when the process finished or the user pressed the button.</td> -</tr><tr> -<td><a href="#HgLogDialog.__getParents">__getParents</a></td> -<td>Private method to get the parents of the currently viewed file/directory.</td> -</tr><tr> -<td><a href="#HgLogDialog.__procFinished">__procFinished</a></td> -<td>Private slot connected to the finished signal.</td> -</tr><tr> -<td><a href="#HgLogDialog.__processOutputLine">__processOutputLine</a></td> -<td>Private method to process the lines of output.</td> -</tr><tr> -<td><a href="#HgLogDialog.__readStderr">__readStderr</a></td> -<td>Private slot to handle the readyReadStandardError signal.</td> -</tr><tr> -<td><a href="#HgLogDialog.__readStdout">__readStdout</a></td> -<td>Private slot to handle the readyReadStandardOutput signal.</td> -</tr><tr> -<td><a href="#HgLogDialog.__showError">__showError</a></td> -<td>Private slot to show some error.</td> -</tr><tr> -<td><a href="#HgLogDialog.__sourceChanged">__sourceChanged</a></td> -<td>Private slot to handle the sourceChanged signal of the contents pane.</td> -</tr><tr> -<td><a href="#HgLogDialog.closeEvent">closeEvent</a></td> -<td>Protected slot implementing a close event handler.</td> -</tr><tr> -<td><a href="#HgLogDialog.keyPressEvent">keyPressEvent</a></td> -<td>Protected slot to handle a key press event.</td> -</tr><tr> -<td><a href="#HgLogDialog.on_input_returnPressed">on_input_returnPressed</a></td> -<td>Private slot to handle the press of the return key in the input field.</td> -</tr><tr> -<td><a href="#HgLogDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> -<td>Private slot to handle the password checkbox toggled.</td> -</tr><tr> -<td><a href="#HgLogDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> -<td>Private slot to send the input to the hg process.</td> -</tr><tr> -<td><a href="#HgLogDialog.start">start</a></td> -<td>Public slot to start the hg log command.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="HgLogDialog.__init__" ID="HgLogDialog.__init__"></a> -<h4>HgLogDialog (Constructor)</h4> -<b>HgLogDialog</b>(<i>vcs, mode="log", bundle=None, isFile=False, parent=None</i>) -<p> - Constructor -</p><dl> -<dt><i>vcs</i></dt> -<dd> -reference to the vcs object -</dd><dt><i>mode</i></dt> -<dd> -mode of the dialog (string; one of log, incoming, outgoing) -</dd><dt><i>bundle</i></dt> -<dd> -name of a bundle file (string) -</dd><dt><i>isFile</i></dt> -<dd> -flag indicating log for a file is to be shown (boolean) -</dd><dt><i>parent</i></dt> -<dd> -parent widget (QWidget) -</dd> -</dl><a NAME="HgLogDialog.__finish" ID="HgLogDialog.__finish"></a> -<h4>HgLogDialog.__finish</h4> -<b>__finish</b>(<i></i>) -<p> - Private slot called when the process finished or the user pressed - the button. -</p><a NAME="HgLogDialog.__getParents" ID="HgLogDialog.__getParents"></a> -<h4>HgLogDialog.__getParents</h4> -<b>__getParents</b>(<i>rev</i>) -<p> - Private method to get the parents of the currently viewed - file/directory. -</p><dl> -<dt><i>rev</i></dt> -<dd> -revision number to get parents for (string) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -list of parent revisions (list of strings) -</dd> -</dl><a NAME="HgLogDialog.__procFinished" ID="HgLogDialog.__procFinished"></a> -<h4>HgLogDialog.__procFinished</h4> -<b>__procFinished</b>(<i>exitCode, exitStatus</i>) -<p> - Private slot connected to the finished signal. -</p><dl> -<dt><i>exitCode</i></dt> -<dd> -exit code of the process (integer) -</dd><dt><i>exitStatus</i></dt> -<dd> -exit status of the process (QProcess.ExitStatus) -</dd> -</dl><a NAME="HgLogDialog.__processOutputLine" ID="HgLogDialog.__processOutputLine"></a> -<h4>HgLogDialog.__processOutputLine</h4> -<b>__processOutputLine</b>(<i>line</i>) -<p> - Private method to process the lines of output. -</p><dl> -<dt><i>line</i></dt> -<dd> -output line to be processed (string) -</dd> -</dl><a NAME="HgLogDialog.__readStderr" ID="HgLogDialog.__readStderr"></a> -<h4>HgLogDialog.__readStderr</h4> -<b>__readStderr</b>(<i></i>) -<p> - Private slot to handle the readyReadStandardError signal. -</p><p> - It reads the error output of the process and inserts it into the - error pane. -</p><a NAME="HgLogDialog.__readStdout" ID="HgLogDialog.__readStdout"></a> -<h4>HgLogDialog.__readStdout</h4> -<b>__readStdout</b>(<i></i>) -<p> - Private slot to handle the readyReadStandardOutput signal. -</p><p> - It reads the output of the process and inserts it into a buffer. -</p><a NAME="HgLogDialog.__showError" ID="HgLogDialog.__showError"></a> -<h4>HgLogDialog.__showError</h4> -<b>__showError</b>(<i>out</i>) -<p> - Private slot to show some error. -</p><dl> -<dt><i>out</i></dt> -<dd> -error to be shown (string) -</dd> -</dl><a NAME="HgLogDialog.__sourceChanged" ID="HgLogDialog.__sourceChanged"></a> -<h4>HgLogDialog.__sourceChanged</h4> -<b>__sourceChanged</b>(<i>url</i>) -<p> - Private slot to handle the sourceChanged signal of the contents pane. -</p><dl> -<dt><i>url</i></dt> -<dd> -the url that was clicked (QUrl) -</dd> -</dl><a NAME="HgLogDialog.closeEvent" ID="HgLogDialog.closeEvent"></a> -<h4>HgLogDialog.closeEvent</h4> -<b>closeEvent</b>(<i>e</i>) -<p> - Protected slot implementing a close event handler. -</p><dl> -<dt><i>e</i></dt> -<dd> -close event (QCloseEvent) -</dd> -</dl><a NAME="HgLogDialog.keyPressEvent" ID="HgLogDialog.keyPressEvent"></a> -<h4>HgLogDialog.keyPressEvent</h4> -<b>keyPressEvent</b>(<i>evt</i>) -<p> - Protected slot to handle a key press event. -</p><dl> -<dt><i>evt</i></dt> -<dd> -the key press event (QKeyEvent) -</dd> -</dl><a NAME="HgLogDialog.on_input_returnPressed" ID="HgLogDialog.on_input_returnPressed"></a> -<h4>HgLogDialog.on_input_returnPressed</h4> -<b>on_input_returnPressed</b>(<i></i>) -<p> - Private slot to handle the press of the return key in the input field. -</p><a NAME="HgLogDialog.on_passwordCheckBox_toggled" ID="HgLogDialog.on_passwordCheckBox_toggled"></a> -<h4>HgLogDialog.on_passwordCheckBox_toggled</h4> -<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) -<p> - Private slot to handle the password checkbox toggled. -</p><dl> -<dt><i>isOn</i></dt> -<dd> -flag indicating the status of the check box (boolean) -</dd> -</dl><a NAME="HgLogDialog.on_sendButton_clicked" ID="HgLogDialog.on_sendButton_clicked"></a> -<h4>HgLogDialog.on_sendButton_clicked</h4> -<b>on_sendButton_clicked</b>(<i></i>) -<p> - Private slot to send the input to the hg process. -</p><a NAME="HgLogDialog.start" ID="HgLogDialog.start"></a> -<h4>HgLogDialog.start</h4> -<b>start</b>(<i>fn, noEntries=0, revisions=None</i>) -<p> - Public slot to start the hg log command. -</p><dl> -<dt><i>fn</i></dt> -<dd> -filename to show the log for (string) -</dd><dt><i>noEntries</i></dt> -<dd> -number of entries to show (integer) -</dd><dt><i>revisions</i></dt> -<dd> -revisions to show log for (list of strings) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html --- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html Fri Jan 27 19:18:52 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,234 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog</title> -<meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> -</head> -<body><a NAME="top" ID="top"></a> -<h1>eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog</h1> -<p> -Module implementing a dialog to select revisions. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr> -<td><a href="#HgMultiRevisionSelectionDialog">HgMultiRevisionSelectionDialog</a></td> -<td>Class implementing a dialog to select revisions.</td> -</tr> -</table> -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> -<hr /><hr /> -<a NAME="HgMultiRevisionSelectionDialog" ID="HgMultiRevisionSelectionDialog"></a> -<h2>HgMultiRevisionSelectionDialog</h2> -<p> - Class implementing a dialog to select revisions. -</p> -<h3>Derived from</h3> -QDialog, Ui_HgMultiRevisionSelectionDialog -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Methods</h3> -<table> -<tr> -<td><a href="#HgMultiRevisionSelectionDialog.__init__">HgMultiRevisionSelectionDialog</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.__updateOK">__updateOK</a></td> -<td>Private slot to update the OK button.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.getRevisions">getRevisions</a></td> -<td>Public method to retrieve the selected revisions.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled">on_bookmarkButton_toggled</a></td> -<td>Private slot to handle changes of the Bookmark select button.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged">on_bookmarkCombo_editTextChanged</a></td> -<td>Private slot to handle changes of the Bookmark combo.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.on_branchButton_toggled">on_branchButton_toggled</a></td> -<td>Private slot to handle changes of the Branch select button.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged">on_branchCombo_editTextChanged</a></td> -<td>Private slot to handle changes of the Branch combo.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.on_changesetsButton_toggled">on_changesetsButton_toggled</a></td> -<td>Private slot to handle changes of the Changesets select button.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged">on_changesetsEdit_textChanged</a></td> -<td>Private slot to handle changes of the Changesets edit.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.on_limitGroup_toggled">on_limitGroup_toggled</a></td> -<td>Private slot to handle changes of the Limit Results group status.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.on_tagButton_toggled">on_tagButton_toggled</a></td> -<td>Private slot to handle changes of the Tag select button.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td> -<td>Private slot to handle changes of the Tag combo.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="HgMultiRevisionSelectionDialog.__init__" ID="HgMultiRevisionSelectionDialog.__init__"></a> -<h4>HgMultiRevisionSelectionDialog (Constructor)</h4> -<b>HgMultiRevisionSelectionDialog</b>(<i>tagsList, branchesList, bookmarksList=None, emptyRevsOk=False, showLimit=False, limitDefault=100, parent=None</i>) -<p> - Constructor -</p><dl> -<dt><i>tagsList</i></dt> -<dd> -list of tags (list of strings) -</dd><dt><i>branchesList</i></dt> -<dd> -list of branches (list of strings) -</dd><dt><i>bookmarksList</i></dt> -<dd> -list of bookmarks (list of strings) -</dd><dt><i>emptyRevsOk</i></dt> -<dd> -flag indicating that it is ok to not enter - revisions (boolean) -</dd><dt><i>showLimit</i></dt> -<dd> -flag indicating to show the limit entry (boolean) -</dd><dt><i>limitDefault</i></dt> -<dd> -default value for the limit (integer) -</dd><dt><i>parent</i></dt> -<dd> -parent widget (QWidget) -</dd> -</dl><a NAME="HgMultiRevisionSelectionDialog.__updateOK" ID="HgMultiRevisionSelectionDialog.__updateOK"></a> -<h4>HgMultiRevisionSelectionDialog.__updateOK</h4> -<b>__updateOK</b>(<i></i>) -<p> - Private slot to update the OK button. -</p><a NAME="HgMultiRevisionSelectionDialog.getRevisions" ID="HgMultiRevisionSelectionDialog.getRevisions"></a> -<h4>HgMultiRevisionSelectionDialog.getRevisions</h4> -<b>getRevisions</b>(<i></i>) -<p> - Public method to retrieve the selected revisions. -</p><dl> -<dt>Returns:</dt> -<dd> -tuple of selected revisions (list of strings) and number - of entries to be shown (integer) -</dd> -</dl><a NAME="HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled" ID="HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled"></a> -<h4>HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled</h4> -<b>on_bookmarkButton_toggled</b>(<i>checked</i>) -<p> - Private slot to handle changes of the Bookmark select button. -</p><dl> -<dt><i>checked</i></dt> -<dd> -state of the button (boolean) -</dd> -</dl><a NAME="HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged" ID="HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged"></a> -<h4>HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged</h4> -<b>on_bookmarkCombo_editTextChanged</b>(<i>txt</i>) -<p> - Private slot to handle changes of the Bookmark combo. -</p><dl> -<dt><i>txt</i></dt> -<dd> -text of the combo (string) -</dd> -</dl><a NAME="HgMultiRevisionSelectionDialog.on_branchButton_toggled" ID="HgMultiRevisionSelectionDialog.on_branchButton_toggled"></a> -<h4>HgMultiRevisionSelectionDialog.on_branchButton_toggled</h4> -<b>on_branchButton_toggled</b>(<i>checked</i>) -<p> - Private slot to handle changes of the Branch select button. -</p><dl> -<dt><i>checked</i></dt> -<dd> -state of the button (boolean) -</dd> -</dl><a NAME="HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged" ID="HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged"></a> -<h4>HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged</h4> -<b>on_branchCombo_editTextChanged</b>(<i>txt</i>) -<p> - Private slot to handle changes of the Branch combo. -</p><dl> -<dt><i>txt</i></dt> -<dd> -text of the combo (string) -</dd> -</dl><a NAME="HgMultiRevisionSelectionDialog.on_changesetsButton_toggled" ID="HgMultiRevisionSelectionDialog.on_changesetsButton_toggled"></a> -<h4>HgMultiRevisionSelectionDialog.on_changesetsButton_toggled</h4> -<b>on_changesetsButton_toggled</b>(<i>checked</i>) -<p> - Private slot to handle changes of the Changesets select button. -</p><dl> -<dt><i>checked</i></dt> -<dd> -state of the button (boolean) -</dd> -</dl><a NAME="HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged" ID="HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged"></a> -<h4>HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged</h4> -<b>on_changesetsEdit_textChanged</b>(<i></i>) -<p> - Private slot to handle changes of the Changesets edit. -</p><a NAME="HgMultiRevisionSelectionDialog.on_limitGroup_toggled" ID="HgMultiRevisionSelectionDialog.on_limitGroup_toggled"></a> -<h4>HgMultiRevisionSelectionDialog.on_limitGroup_toggled</h4> -<b>on_limitGroup_toggled</b>(<i>checked</i>) -<p> - Private slot to handle changes of the Limit Results group status. -</p><dl> -<dt><i>checked</i></dt> -<dd> -state of the group (boolean) -</dd> -</dl><a NAME="HgMultiRevisionSelectionDialog.on_tagButton_toggled" ID="HgMultiRevisionSelectionDialog.on_tagButton_toggled"></a> -<h4>HgMultiRevisionSelectionDialog.on_tagButton_toggled</h4> -<b>on_tagButton_toggled</b>(<i>checked</i>) -<p> - Private slot to handle changes of the Tag select button. -</p><dl> -<dt><i>checked</i></dt> -<dd> -state of the button (boolean) -</dd> -</dl><a NAME="HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged" ID="HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged"></a> -<h4>HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged</h4> -<b>on_tagCombo_editTextChanged</b>(<i>txt</i>) -<p> - Private slot to handle changes of the Tag combo. -</p><dl> -<dt><i>txt</i></dt> -<dd> -text of the combo (string) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html --- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html Fri Feb 03 19:20:59 2017 +0100 @@ -359,9 +359,6 @@ <td><a href="#Hg.vcsInitConfig">vcsInitConfig</a></td> <td>Public method to initialize the VCS configuration.</td> </tr><tr> -<td><a href="#Hg.vcsLog">vcsLog</a></td> -<td>Public method used to view the log of a file/directory from the Mercurial repository.</td> -</tr><tr> <td><a href="#Hg.vcsLogBrowser">vcsLogBrowser</a></td> <td>Public method used to browse the log of a file/directory from the Mercurial repository.</td> </tr><tr> @@ -1723,17 +1720,6 @@ <dd> reference to the project (Project) </dd> -</dl><a NAME="Hg.vcsLog" ID="Hg.vcsLog"></a> -<h4>Hg.vcsLog</h4> -<b>vcsLog</b>(<i>name</i>) -<p> - Public method used to view the log of a file/directory from the - Mercurial repository. -</p><dl> -<dt><i>name</i></dt> -<dd> -file/directory name to show the log of (string) -</dd> </dl><a NAME="Hg.vcsLogBrowser" ID="Hg.vcsLogBrowser"></a> <h4>Hg.vcsLogBrowser</h4> <b>vcsLogBrowser</b>(<i>name, isFile=False</i>)
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html --- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html Fri Feb 03 19:20:59 2017 +0100 @@ -114,6 +114,9 @@ <td><a href="#SvnLogBrowserDialog.on_diffRevisionsButton_clicked">on_diffRevisionsButton_clicked</a></td> <td>Private slot to handle the Compare Revisions button.</td> </tr><tr> +<td><a href="#SvnLogBrowserDialog.on_downButton_clicked">on_downButton_clicked</a></td> +<td>Private slot to move the current item down one entry.</td> +</tr><tr> <td><a href="#SvnLogBrowserDialog.on_fieldCombo_activated">on_fieldCombo_activated</a></td> <td>Private slot called, when a new filter field is selected.</td> </tr><tr> @@ -138,6 +141,9 @@ <td><a href="#SvnLogBrowserDialog.on_toDate_dateChanged">on_toDate_dateChanged</a></td> <td>Private slot called, when the from date changes.</td> </tr><tr> +<td><a href="#SvnLogBrowserDialog.on_upButton_clicked">on_upButton_clicked</a></td> +<td>Private slot to move the current item up one entry.</td> +</tr><tr> <td><a href="#SvnLogBrowserDialog.show">show</a></td> <td>Public slot to show the dialog.</td> </tr><tr> @@ -325,6 +331,11 @@ <b>on_diffRevisionsButton_clicked</b>(<i></i>) <p> Private slot to handle the Compare Revisions button. +</p><a NAME="SvnLogBrowserDialog.on_downButton_clicked" ID="SvnLogBrowserDialog.on_downButton_clicked"></a> +<h4>SvnLogBrowserDialog.on_downButton_clicked</h4> +<b>on_downButton_clicked</b>(<i></i>) +<p> + Private slot to move the current item down one entry. </p><a NAME="SvnLogBrowserDialog.on_fieldCombo_activated" ID="SvnLogBrowserDialog.on_fieldCombo_activated"></a> <h4>SvnLogBrowserDialog.on_fieldCombo_activated</h4> <b>on_fieldCombo_activated</b>(<i>txt</i>) @@ -398,7 +409,12 @@ <dd> new date (QDate) </dd> -</dl><a NAME="SvnLogBrowserDialog.show" ID="SvnLogBrowserDialog.show"></a> +</dl><a NAME="SvnLogBrowserDialog.on_upButton_clicked" ID="SvnLogBrowserDialog.on_upButton_clicked"></a> +<h4>SvnLogBrowserDialog.on_upButton_clicked</h4> +<b>on_upButton_clicked</b>(<i></i>) +<p> + Private slot to move the current item up one entry. +</p><a NAME="SvnLogBrowserDialog.show" ID="SvnLogBrowserDialog.show"></a> <h4>SvnLogBrowserDialog.show</h4> <b>show</b>(<i></i>) <p>
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html --- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html Fri Jan 27 19:18:52 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,153 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog</title> -<meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> -</head> -<body><a NAME="top" ID="top"></a> -<h1>eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog</h1> -<p> -Module implementing a dialog to show the output of the svn log command process. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr> -<td><a href="#SvnLogDialog">SvnLogDialog</a></td> -<td>Class implementing a dialog to show the output of the svn log command.</td> -</tr> -</table> -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> -<hr /><hr /> -<a NAME="SvnLogDialog" ID="SvnLogDialog"></a> -<h2>SvnLogDialog</h2> -<p> - Class implementing a dialog to show the output of the svn log command. -</p><p> - The dialog is nonmodal. Clicking a link in the upper text pane shows - a diff of the versions. -</p> -<h3>Derived from</h3> -QWidget, SvnDialogMixin, Ui_SvnLogDialog -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Methods</h3> -<table> -<tr> -<td><a href="#SvnLogDialog.__init__">SvnLogDialog</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#SvnLogDialog.__finish">__finish</a></td> -<td>Private slot called when the user pressed the button.</td> -</tr><tr> -<td><a href="#SvnLogDialog.__showError">__showError</a></td> -<td>Private slot to show an error message.</td> -</tr><tr> -<td><a href="#SvnLogDialog.__sourceChanged">__sourceChanged</a></td> -<td>Private slot to handle the sourceChanged signal of the contents pane.</td> -</tr><tr> -<td><a href="#SvnLogDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> -<td>Private slot called by a button of the button box clicked.</td> -</tr><tr> -<td><a href="#SvnLogDialog.start">start</a></td> -<td>Public slot to start the svn log command.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="SvnLogDialog.__init__" ID="SvnLogDialog.__init__"></a> -<h4>SvnLogDialog (Constructor)</h4> -<b>SvnLogDialog</b>(<i>vcs, isFile=False, parent=None</i>) -<p> - Constructor -</p><dl> -<dt><i>vcs</i></dt> -<dd> -reference to the vcs object -</dd><dt><i>isFile</i></dt> -<dd> -flag indicating log for a file is to be shown (boolean) -</dd><dt><i>parent</i></dt> -<dd> -parent widget (QWidget) -</dd> -</dl><a NAME="SvnLogDialog.__finish" ID="SvnLogDialog.__finish"></a> -<h4>SvnLogDialog.__finish</h4> -<b>__finish</b>(<i></i>) -<p> - Private slot called when the user pressed the button. -</p><a NAME="SvnLogDialog.__showError" ID="SvnLogDialog.__showError"></a> -<h4>SvnLogDialog.__showError</h4> -<b>__showError</b>(<i>msg</i>) -<p> - Private slot to show an error message. -</p><dl> -<dt><i>msg</i></dt> -<dd> -error message to show (string) -</dd> -</dl><a NAME="SvnLogDialog.__sourceChanged" ID="SvnLogDialog.__sourceChanged"></a> -<h4>SvnLogDialog.__sourceChanged</h4> -<b>__sourceChanged</b>(<i>url</i>) -<p> - Private slot to handle the sourceChanged signal of the contents pane. -</p><dl> -<dt><i>url</i></dt> -<dd> -the url that was clicked (QUrl) -</dd> -</dl><a NAME="SvnLogDialog.on_buttonBox_clicked" ID="SvnLogDialog.on_buttonBox_clicked"></a> -<h4>SvnLogDialog.on_buttonBox_clicked</h4> -<b>on_buttonBox_clicked</b>(<i>button</i>) -<p> - Private slot called by a button of the button box clicked. -</p><dl> -<dt><i>button</i></dt> -<dd> -button that was clicked (QAbstractButton) -</dd> -</dl><a NAME="SvnLogDialog.start" ID="SvnLogDialog.start"></a> -<h4>SvnLogDialog.start</h4> -<b>start</b>(<i>fn, noEntries=0</i>) -<p> - Public slot to start the svn log command. -</p><dl> -<dt><i>fn</i></dt> -<dd> -filename to show the log for (string) -</dd><dt><i>noEntries</i></dt> -<dd> -number of entries to show (integer) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html --- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html Fri Feb 03 19:20:59 2017 +0100 @@ -219,9 +219,6 @@ <td><a href="#Subversion.vcsInitConfig">vcsInitConfig</a></td> <td>Public method to initialize the VCS configuration.</td> </tr><tr> -<td><a href="#Subversion.vcsLog">vcsLog</a></td> -<td>Public method used to view the log of a file/directory from the Subversion repository.</td> -</tr><tr> <td><a href="#Subversion.vcsLogBrowser">vcsLogBrowser</a></td> <td>Public method used to browse the log of a file/directory from the Subversion repository.</td> </tr><tr> @@ -1075,17 +1072,6 @@ <dd> reference to the project (Project) </dd> -</dl><a NAME="Subversion.vcsLog" ID="Subversion.vcsLog"></a> -<h4>Subversion.vcsLog</h4> -<b>vcsLog</b>(<i>name</i>) -<p> - Public method used to view the log of a file/directory from the - Subversion repository. -</p><dl> -<dt><i>name</i></dt> -<dd> -file/directory name to show the log of (string) -</dd> </dl><a NAME="Subversion.vcsLogBrowser" ID="Subversion.vcsLogBrowser"></a> <h4>Subversion.vcsLogBrowser</h4> <b>vcsLogBrowser</b>(<i>name, isFile=False</i>)
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html --- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html Fri Feb 03 19:20:59 2017 +0100 @@ -60,6 +60,9 @@ <td><a href="#SvnLogBrowserDialog.__init__">SvnLogBrowserDialog</a></td> <td>Constructor</td> </tr><tr> +<td><a href="#SvnLogBrowserDialog.__addFinishCallback">__addFinishCallback</a></td> +<td>Private method to add a method to be called once the process finished.</td> +</tr><tr> <td><a href="#SvnLogBrowserDialog.__diffRevisions">__diffRevisions</a></td> <td>Private method to do a diff of two revisions.</td> </tr><tr> @@ -123,6 +126,9 @@ <td><a href="#SvnLogBrowserDialog.on_diffRevisionsButton_clicked">on_diffRevisionsButton_clicked</a></td> <td>Private slot to handle the Compare Revisions button.</td> </tr><tr> +<td><a href="#SvnLogBrowserDialog.on_downButton_clicked">on_downButton_clicked</a></td> +<td>Private slot to move the current item down one entry.</td> +</tr><tr> <td><a href="#SvnLogBrowserDialog.on_fieldCombo_activated">on_fieldCombo_activated</a></td> <td>Private slot called, when a new filter field is selected.</td> </tr><tr> @@ -156,6 +162,9 @@ <td><a href="#SvnLogBrowserDialog.on_toDate_dateChanged">on_toDate_dateChanged</a></td> <td>Private slot called, when the from date changes.</td> </tr><tr> +<td><a href="#SvnLogBrowserDialog.on_upButton_clicked">on_upButton_clicked</a></td> +<td>Private slot to move the current item up one entry.</td> +</tr><tr> <td><a href="#SvnLogBrowserDialog.show">show</a></td> <td>Public slot to show the dialog.</td> </tr><tr> @@ -180,6 +189,19 @@ <dd> parent widget (QWidget) </dd> +</dl><a NAME="SvnLogBrowserDialog.__addFinishCallback" ID="SvnLogBrowserDialog.__addFinishCallback"></a> +<h4>SvnLogBrowserDialog.__addFinishCallback</h4> +<b>__addFinishCallback</b>(<i>callback</i>) +<p> + Private method to add a method to be called once the process finished. +</p><p> + The callback methods are invoke in a FIFO style and are consumed. If + a callback method needs to be called again, it must be added again. +</p><dl> +<dt><i>callback</i> (function)</dt> +<dd> +callback method +</dd> </dl><a NAME="SvnLogBrowserDialog.__diffRevisions" ID="SvnLogBrowserDialog.__diffRevisions"></a> <h4>SvnLogBrowserDialog.__diffRevisions</h4> <b>__diffRevisions</b>(<i>rev1, rev2</i>) @@ -369,6 +391,11 @@ <b>on_diffRevisionsButton_clicked</b>(<i></i>) <p> Private slot to handle the Compare Revisions button. +</p><a NAME="SvnLogBrowserDialog.on_downButton_clicked" ID="SvnLogBrowserDialog.on_downButton_clicked"></a> +<h4>SvnLogBrowserDialog.on_downButton_clicked</h4> +<b>on_downButton_clicked</b>(<i></i>) +<p> + Private slot to move the current item down one entry. </p><a NAME="SvnLogBrowserDialog.on_fieldCombo_activated" ID="SvnLogBrowserDialog.on_fieldCombo_activated"></a> <h4>SvnLogBrowserDialog.on_fieldCombo_activated</h4> <b>on_fieldCombo_activated</b>(<i>txt</i>) @@ -462,7 +489,12 @@ <dd> new date (QDate) </dd> -</dl><a NAME="SvnLogBrowserDialog.show" ID="SvnLogBrowserDialog.show"></a> +</dl><a NAME="SvnLogBrowserDialog.on_upButton_clicked" ID="SvnLogBrowserDialog.on_upButton_clicked"></a> +<h4>SvnLogBrowserDialog.on_upButton_clicked</h4> +<b>on_upButton_clicked</b>(<i></i>) +<p> + Private slot to move the current item up one entry. +</p><a NAME="SvnLogBrowserDialog.show" ID="SvnLogBrowserDialog.show"></a> <h4>SvnLogBrowserDialog.show</h4> <b>show</b>(<i></i>) <p>
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html --- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html Fri Jan 27 19:18:52 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,212 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog</title> -<meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> -</head> -<body><a NAME="top" ID="top"></a> -<h1>eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog</h1> -<p> -Module implementing a dialog to show the output of the svn log command process. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr> -<td><a href="#SvnLogDialog">SvnLogDialog</a></td> -<td>Class implementing a dialog to show the output of the svn log command process.</td> -</tr> -</table> -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> -<hr /><hr /> -<a NAME="SvnLogDialog" ID="SvnLogDialog"></a> -<h2>SvnLogDialog</h2> -<p> - Class implementing a dialog to show the output of the svn log command - process. -</p><p> - The dialog is nonmodal. Clicking a link in the upper text pane shows - a diff of the versions. -</p> -<h3>Derived from</h3> -QWidget, Ui_SvnLogDialog -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Methods</h3> -<table> -<tr> -<td><a href="#SvnLogDialog.__init__">SvnLogDialog</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#SvnLogDialog.__procFinished">__procFinished</a></td> -<td>Private slot connected to the finished signal.</td> -</tr><tr> -<td><a href="#SvnLogDialog.__readStderr">__readStderr</a></td> -<td>Private slot to handle the readyReadStandardError signal.</td> -</tr><tr> -<td><a href="#SvnLogDialog.__readStdout">__readStdout</a></td> -<td>Private slot to handle the readyReadStandardOutput signal.</td> -</tr><tr> -<td><a href="#SvnLogDialog.__sourceChanged">__sourceChanged</a></td> -<td>Private slot to handle the sourceChanged signal of the contents pane.</td> -</tr><tr> -<td><a href="#SvnLogDialog.closeEvent">closeEvent</a></td> -<td>Protected slot implementing a close event handler.</td> -</tr><tr> -<td><a href="#SvnLogDialog.keyPressEvent">keyPressEvent</a></td> -<td>Protected slot to handle a key press event.</td> -</tr><tr> -<td><a href="#SvnLogDialog.on_input_returnPressed">on_input_returnPressed</a></td> -<td>Private slot to handle the press of the return key in the input field.</td> -</tr><tr> -<td><a href="#SvnLogDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> -<td>Private slot to handle the password checkbox toggled.</td> -</tr><tr> -<td><a href="#SvnLogDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> -<td>Private slot to send the input to the subversion process.</td> -</tr><tr> -<td><a href="#SvnLogDialog.start">start</a></td> -<td>Public slot to start the cvs log command.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="SvnLogDialog.__init__" ID="SvnLogDialog.__init__"></a> -<h4>SvnLogDialog (Constructor)</h4> -<b>SvnLogDialog</b>(<i>vcs, isFile=False, parent=None</i>) -<p> - Constructor -</p><dl> -<dt><i>vcs</i></dt> -<dd> -reference to the vcs object -</dd><dt><i>isFile</i></dt> -<dd> -flag indicating log for a file is to be shown (boolean) -</dd><dt><i>parent</i></dt> -<dd> -parent widget (QWidget) -</dd> -</dl><a NAME="SvnLogDialog.__procFinished" ID="SvnLogDialog.__procFinished"></a> -<h4>SvnLogDialog.__procFinished</h4> -<b>__procFinished</b>(<i>exitCode, exitStatus</i>) -<p> - Private slot connected to the finished signal. -</p><dl> -<dt><i>exitCode</i></dt> -<dd> -exit code of the process (integer) -</dd><dt><i>exitStatus</i></dt> -<dd> -exit status of the process (QProcess.ExitStatus) -</dd> -</dl><a NAME="SvnLogDialog.__readStderr" ID="SvnLogDialog.__readStderr"></a> -<h4>SvnLogDialog.__readStderr</h4> -<b>__readStderr</b>(<i></i>) -<p> - Private slot to handle the readyReadStandardError signal. -</p><p> - It reads the error output of the process and inserts it into the - error pane. -</p><a NAME="SvnLogDialog.__readStdout" ID="SvnLogDialog.__readStdout"></a> -<h4>SvnLogDialog.__readStdout</h4> -<b>__readStdout</b>(<i></i>) -<p> - Private slot to handle the readyReadStandardOutput signal. -</p><p> - It reads the output of the process and inserts it into a buffer. -</p><a NAME="SvnLogDialog.__sourceChanged" ID="SvnLogDialog.__sourceChanged"></a> -<h4>SvnLogDialog.__sourceChanged</h4> -<b>__sourceChanged</b>(<i>url</i>) -<p> - Private slot to handle the sourceChanged signal of the contents pane. -</p><dl> -<dt><i>url</i></dt> -<dd> -the url that was clicked (QUrl) -</dd> -</dl><a NAME="SvnLogDialog.closeEvent" ID="SvnLogDialog.closeEvent"></a> -<h4>SvnLogDialog.closeEvent</h4> -<b>closeEvent</b>(<i>e</i>) -<p> - Protected slot implementing a close event handler. -</p><dl> -<dt><i>e</i></dt> -<dd> -close event (QCloseEvent) -</dd> -</dl><a NAME="SvnLogDialog.keyPressEvent" ID="SvnLogDialog.keyPressEvent"></a> -<h4>SvnLogDialog.keyPressEvent</h4> -<b>keyPressEvent</b>(<i>evt</i>) -<p> - Protected slot to handle a key press event. -</p><dl> -<dt><i>evt</i></dt> -<dd> -the key press event (QKeyEvent) -</dd> -</dl><a NAME="SvnLogDialog.on_input_returnPressed" ID="SvnLogDialog.on_input_returnPressed"></a> -<h4>SvnLogDialog.on_input_returnPressed</h4> -<b>on_input_returnPressed</b>(<i></i>) -<p> - Private slot to handle the press of the return key in the input field. -</p><a NAME="SvnLogDialog.on_passwordCheckBox_toggled" ID="SvnLogDialog.on_passwordCheckBox_toggled"></a> -<h4>SvnLogDialog.on_passwordCheckBox_toggled</h4> -<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) -<p> - Private slot to handle the password checkbox toggled. -</p><dl> -<dt><i>isOn</i></dt> -<dd> -flag indicating the status of the check box (boolean) -</dd> -</dl><a NAME="SvnLogDialog.on_sendButton_clicked" ID="SvnLogDialog.on_sendButton_clicked"></a> -<h4>SvnLogDialog.on_sendButton_clicked</h4> -<b>on_sendButton_clicked</b>(<i></i>) -<p> - Private slot to send the input to the subversion process. -</p><a NAME="SvnLogDialog.start" ID="SvnLogDialog.start"></a> -<h4>SvnLogDialog.start</h4> -<b>start</b>(<i>fn, noEntries=0</i>) -<p> - Public slot to start the cvs log command. -</p><dl> -<dt><i>fn</i></dt> -<dd> -filename to show the log for (string) -</dd><dt><i>noEntries</i></dt> -<dd> -number of entries to show (integer) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.subversion.html --- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.subversion.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.subversion.html Fri Feb 03 19:20:59 2017 +0100 @@ -210,9 +210,6 @@ <td><a href="#Subversion.vcsInitConfig">vcsInitConfig</a></td> <td>Public method to initialize the VCS configuration.</td> </tr><tr> -<td><a href="#Subversion.vcsLog">vcsLog</a></td> -<td>Public method used to view the log of a file/directory from the Subversion repository.</td> -</tr><tr> <td><a href="#Subversion.vcsLogBrowser">vcsLogBrowser</a></td> <td>Public method used to browse the log of a file/directory from the Subversion repository.</td> </tr><tr> @@ -1026,17 +1023,6 @@ <dd> reference to the project (Project) </dd> -</dl><a NAME="Subversion.vcsLog" ID="Subversion.vcsLog"></a> -<h4>Subversion.vcsLog</h4> -<b>vcsLog</b>(<i>name</i>) -<p> - Public method used to view the log of a file/directory from the - Subversion repository. -</p><dl> -<dt><i>name</i></dt> -<dd> -file/directory name to show the log of (string) -</dd> </dl><a NAME="Subversion.vcsLogBrowser" ID="Subversion.vcsLogBrowser"></a> <h4>Subversion.vcsLogBrowser</h4> <b>vcsLogBrowser</b>(<i>name, isFile=False</i>)
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.Preferences.ConfigurationPages.EmailPage.html --- a/Documentation/Source/eric6.Preferences.ConfigurationPages.EmailPage.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.Preferences.ConfigurationPages.EmailPage.html Fri Feb 03 19:20:59 2017 +0100 @@ -63,21 +63,36 @@ <td><a href="#EmailPage.__init__">EmailPage</a></td> <td>Constructor</td> </tr><tr> +<td><a href="#EmailPage.__updatePortSpin">__updatePortSpin</a></td> +<td>Private slot to set the value of the port spin box depending upon the selected encryption method.</td> +</tr><tr> <td><a href="#EmailPage.__updateTestButton">__updateTestButton</a></td> <td>Private slot to update the enabled state of the test button.</td> </tr><tr> -<td><a href="#EmailPage.on_mailAuthenticationCheckBox_toggled">on_mailAuthenticationCheckBox_toggled</a></td> -<td>Private slot to handle a change of the state of the authentication selector.</td> +<td><a href="#EmailPage.on_mailAuthenticationGroup_toggled">on_mailAuthenticationGroup_toggled</a></td> +<td>Private slot to handle a change of the state of the authentication group.</td> </tr><tr> <td><a href="#EmailPage.on_mailPasswordEdit_textChanged">on_mailPasswordEdit_textChanged</a></td> <td>Private slot to handle a change of the text of the user edit.</td> </tr><tr> +<td><a href="#EmailPage.on_mailServerEdit_textChanged">on_mailServerEdit_textChanged</a></td> +<td>Private slot to handle a change of the text of the mail server edit.</td> +</tr><tr> <td><a href="#EmailPage.on_mailUserEdit_textChanged">on_mailUserEdit_textChanged</a></td> <td>Private slot to handle a change of the text of the user edit.</td> </tr><tr> +<td><a href="#EmailPage.on_noEncryptionButton_toggled">on_noEncryptionButton_toggled</a></td> +<td>Private slot handling a change of no encryption button.</td> +</tr><tr> <td><a href="#EmailPage.on_testButton_clicked">on_testButton_clicked</a></td> <td>Private slot to test the mail server login data.</td> </tr><tr> +<td><a href="#EmailPage.on_useSslButton_toggled">on_useSslButton_toggled</a></td> +<td>Private slot handling a change of SSL encryption button.</td> +</tr><tr> +<td><a href="#EmailPage.on_useTlsButton_toggled">on_useTlsButton_toggled</a></td> +<td>Private slot handling a change of TLS encryption button.</td> +</tr><tr> <td><a href="#EmailPage.save">save</a></td> <td>Public slot to save the Email configuration.</td> </tr> @@ -91,21 +106,27 @@ <b>EmailPage</b>(<i></i>) <p> Constructor +</p><a NAME="EmailPage.__updatePortSpin" ID="EmailPage.__updatePortSpin"></a> +<h4>EmailPage.__updatePortSpin</h4> +<b>__updatePortSpin</b>(<i></i>) +<p> + Private slot to set the value of the port spin box depending upon + the selected encryption method. </p><a NAME="EmailPage.__updateTestButton" ID="EmailPage.__updateTestButton"></a> <h4>EmailPage.__updateTestButton</h4> <b>__updateTestButton</b>(<i></i>) <p> Private slot to update the enabled state of the test button. -</p><a NAME="EmailPage.on_mailAuthenticationCheckBox_toggled" ID="EmailPage.on_mailAuthenticationCheckBox_toggled"></a> -<h4>EmailPage.on_mailAuthenticationCheckBox_toggled</h4> -<b>on_mailAuthenticationCheckBox_toggled</b>(<i>checked</i>) +</p><a NAME="EmailPage.on_mailAuthenticationGroup_toggled" ID="EmailPage.on_mailAuthenticationGroup_toggled"></a> +<h4>EmailPage.on_mailAuthenticationGroup_toggled</h4> +<b>on_mailAuthenticationGroup_toggled</b>(<i>checked</i>) <p> Private slot to handle a change of the state of the authentication - selector. + group. </p><dl> <dt><i>checked</i></dt> <dd> -state of the checkbox (boolean) +state of the group (boolean) </dd> </dl><a NAME="EmailPage.on_mailPasswordEdit_textChanged" ID="EmailPage.on_mailPasswordEdit_textChanged"></a> <h4>EmailPage.on_mailPasswordEdit_textChanged</h4> @@ -117,6 +138,16 @@ <dd> current text of the edit (string) </dd> +</dl><a NAME="EmailPage.on_mailServerEdit_textChanged" ID="EmailPage.on_mailServerEdit_textChanged"></a> +<h4>EmailPage.on_mailServerEdit_textChanged</h4> +<b>on_mailServerEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle a change of the text of the mail server edit. +</p><dl> +<dt><i>txt</i> (str)</dt> +<dd> +current text of the edit (string) +</dd> </dl><a NAME="EmailPage.on_mailUserEdit_textChanged" ID="EmailPage.on_mailUserEdit_textChanged"></a> <h4>EmailPage.on_mailUserEdit_textChanged</h4> <b>on_mailUserEdit_textChanged</b>(<i>txt</i>) @@ -127,12 +158,42 @@ <dd> current text of the edit (string) </dd> +</dl><a NAME="EmailPage.on_noEncryptionButton_toggled" ID="EmailPage.on_noEncryptionButton_toggled"></a> +<h4>EmailPage.on_noEncryptionButton_toggled</h4> +<b>on_noEncryptionButton_toggled</b>(<i>checked</i>) +<p> + Private slot handling a change of no encryption button. +</p><dl> +<dt><i>checked</i> (bool)</dt> +<dd> +current state of the button +</dd> </dl><a NAME="EmailPage.on_testButton_clicked" ID="EmailPage.on_testButton_clicked"></a> <h4>EmailPage.on_testButton_clicked</h4> <b>on_testButton_clicked</b>(<i></i>) <p> Private slot to test the mail server login data. -</p><a NAME="EmailPage.save" ID="EmailPage.save"></a> +</p><a NAME="EmailPage.on_useSslButton_toggled" ID="EmailPage.on_useSslButton_toggled"></a> +<h4>EmailPage.on_useSslButton_toggled</h4> +<b>on_useSslButton_toggled</b>(<i>checked</i>) +<p> + Private slot handling a change of SSL encryption button. +</p><dl> +<dt><i>checked</i> (bool)</dt> +<dd> +current state of the button +</dd> +</dl><a NAME="EmailPage.on_useTlsButton_toggled" ID="EmailPage.on_useTlsButton_toggled"></a> +<h4>EmailPage.on_useTlsButton_toggled</h4> +<b>on_useTlsButton_toggled</b>(<i>checked</i>) +<p> + Private slot handling a change of TLS encryption button. +</p><dl> +<dt><i>checked</i> (bool)</dt> +<dd> +current state of the button +</dd> +</dl><a NAME="EmailPage.save" ID="EmailPage.save"></a> <h4>EmailPage.save</h4> <b>save</b>(<i></i>) <p>
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.QScintilla.Editor.html --- a/Documentation/Source/eric6.QScintilla.Editor.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.QScintilla.Editor.html Fri Feb 03 19:20:59 2017 +0100 @@ -112,6 +112,10 @@ </dd><dt>refreshed()</dt> <dd> emitted to signal a refresh of the editor contents +</dd><dt>settingsRead()</dt> +<dd> +emitted to signal, that the settings have been read + and set </dd><dt>showMenu(str, QMenu, QsciScintillaCompat)</dt> <dd> emitted when a menu is
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.QScintilla.EditorButtonsWidget.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.QScintilla.EditorButtonsWidget.html Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,241 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.QScintilla.EditorButtonsWidget</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric6.QScintilla.EditorButtonsWidget</h1> +<p> +Module implementing a widget containing various buttons for accessing +editor actions. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#EditorButtonsWidget">EditorButtonsWidget</a></td> +<td>Class implementing a widget containing various buttons for accessing editor actions.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="EditorButtonsWidget" ID="EditorButtonsWidget"></a> +<h2>EditorButtonsWidget</h2> +<p> + Class implementing a widget containing various buttons for accessing + editor actions. +</p> +<h3>Derived from</h3> +QWidget +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#EditorButtonsWidget.__init__">EditorButtonsWidget</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.__addButton">__addButton</a></td> +<td>Private method to add a format button.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.__addSeparator">__addSeparator</a></td> +<td>Private method to add a separator line.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.__createButtons">__createButtons</a></td> +<td>Private slot to create the various tool buttons.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.__editorSelectionChanged">__editorSelectionChanged</a></td> +<td>Private slot to handle a change of the editor's selection.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.__editorSettingsRead">__editorSettingsRead</a></td> +<td>Private slot to handle a change of the editor related settings.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.__enableScrollerButtons">__enableScrollerButtons</a></td> +<td>Private method to set the enabled state of the scroll buttons.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.__formatClicked">__formatClicked</a></td> +<td>Private slot to handle a format button being clicked.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.__headerMenuTriggered">__headerMenuTriggered</a></td> +<td>Private method handling the selection of a header menu entry.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.__slide">__slide</a></td> +<td>Private method to move the sliding widget.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.__slideDown">__slideDown</a></td> +<td>Private slot to move the widget downwards, i.e.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.__slideUp">__slideUp</a></td> +<td>Private slot to move the widget upwards, i.e.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.__updateButtonStates">__updateButtonStates</a></td> +<td>Private slot to change the button states.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.resizeEvent">resizeEvent</a></td> +<td>Protected method to handle resize events.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.show">show</a></td> +<td>Public slot to show the widget.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="EditorButtonsWidget.__init__" ID="EditorButtonsWidget.__init__"></a> +<h4>EditorButtonsWidget (Constructor)</h4> +<b>EditorButtonsWidget</b>(<i>editor, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor +</dd><dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl><a NAME="EditorButtonsWidget.__addButton" ID="EditorButtonsWidget.__addButton"></a> +<h4>EditorButtonsWidget.__addButton</h4> +<b>__addButton</b>(<i>format, iconName, toolTip</i>) +<p> + Private method to add a format button. +</p><dl> +<dt><i>format</i> (str)</dt> +<dd> +unique name of the format +</dd><dt><i>iconName</i> (str)</dt> +<dd> +name of the icon for the button +</dd><dt><i>toolTip</i> (str)</dt> +<dd> +text for the tool tip +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +generated button +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QToolButton +</dd> +</dl><a NAME="EditorButtonsWidget.__addSeparator" ID="EditorButtonsWidget.__addSeparator"></a> +<h4>EditorButtonsWidget.__addSeparator</h4> +<b>__addSeparator</b>(<i></i>) +<p> + Private method to add a separator line. +</p><a NAME="EditorButtonsWidget.__createButtons" ID="EditorButtonsWidget.__createButtons"></a> +<h4>EditorButtonsWidget.__createButtons</h4> +<b>__createButtons</b>(<i></i>) +<p> + Private slot to create the various tool buttons. +</p><a NAME="EditorButtonsWidget.__editorSelectionChanged" ID="EditorButtonsWidget.__editorSelectionChanged"></a> +<h4>EditorButtonsWidget.__editorSelectionChanged</h4> +<b>__editorSelectionChanged</b>(<i></i>) +<p> + Private slot to handle a change of the editor's selection. +</p><a NAME="EditorButtonsWidget.__editorSettingsRead" ID="EditorButtonsWidget.__editorSettingsRead"></a> +<h4>EditorButtonsWidget.__editorSettingsRead</h4> +<b>__editorSettingsRead</b>(<i></i>) +<p> + Private slot to handle a change of the editor related settings. +</p><a NAME="EditorButtonsWidget.__enableScrollerButtons" ID="EditorButtonsWidget.__enableScrollerButtons"></a> +<h4>EditorButtonsWidget.__enableScrollerButtons</h4> +<b>__enableScrollerButtons</b>(<i></i>) +<p> + Private method to set the enabled state of the scroll buttons. +</p><a NAME="EditorButtonsWidget.__formatClicked" ID="EditorButtonsWidget.__formatClicked"></a> +<h4>EditorButtonsWidget.__formatClicked</h4> +<b>__formatClicked</b>(<i>format</i>) +<p> + Private slot to handle a format button being clicked. +</p><dl> +<dt><i>format</i> (str)</dt> +<dd> +format type of the button +</dd> +</dl><a NAME="EditorButtonsWidget.__headerMenuTriggered" ID="EditorButtonsWidget.__headerMenuTriggered"></a> +<h4>EditorButtonsWidget.__headerMenuTriggered</h4> +<b>__headerMenuTriggered</b>(<i>act</i>) +<p> + Private method handling the selection of a header menu entry. +</p><dl> +<dt><i>act</i> (QAction)</dt> +<dd> +action of the headers menu that was triggered +</dd> +</dl><a NAME="EditorButtonsWidget.__slide" ID="EditorButtonsWidget.__slide"></a> +<h4>EditorButtonsWidget.__slide</h4> +<b>__slide</b>(<i>up</i>) +<p> + Private method to move the sliding widget. +</p><dl> +<dt><i>up</i></dt> +<dd> +flag indicating to move upwards (boolean) +</dd> +</dl><a NAME="EditorButtonsWidget.__slideDown" ID="EditorButtonsWidget.__slideDown"></a> +<h4>EditorButtonsWidget.__slideDown</h4> +<b>__slideDown</b>(<i></i>) +<p> + Private slot to move the widget downwards, i.e. show contents to + the top. +</p><a NAME="EditorButtonsWidget.__slideUp" ID="EditorButtonsWidget.__slideUp"></a> +<h4>EditorButtonsWidget.__slideUp</h4> +<b>__slideUp</b>(<i></i>) +<p> + Private slot to move the widget upwards, i.e. show contents to the + bottom. +</p><a NAME="EditorButtonsWidget.__updateButtonStates" ID="EditorButtonsWidget.__updateButtonStates"></a> +<h4>EditorButtonsWidget.__updateButtonStates</h4> +<b>__updateButtonStates</b>(<i></i>) +<p> + Private slot to change the button states. +</p><a NAME="EditorButtonsWidget.resizeEvent" ID="EditorButtonsWidget.resizeEvent"></a> +<h4>EditorButtonsWidget.resizeEvent</h4> +<b>resizeEvent</b>(<i>evt</i>) +<p> + Protected method to handle resize events. +</p><dl> +<dt><i>evt</i></dt> +<dd> +reference to the resize event (QResizeEvent) +</dd> +</dl><a NAME="EditorButtonsWidget.show" ID="EditorButtonsWidget.show"></a> +<h4>EditorButtonsWidget.show</h4> +<b>show</b>(<i></i>) +<p> + Public slot to show the widget. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.QScintilla.Lexers.LexerJSON.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.QScintilla.Lexers.LexerJSON.html Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,156 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.QScintilla.Lexers.LexerJSON</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric6.QScintilla.Lexers.LexerJSON</h1> +<p> +Module implementing a JSON lexer with some additional methods. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#LexerJSON">LexerJSON</a></td> +<td>Subclass to implement some additional lexer dependent methods.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="LexerJSON" ID="LexerJSON"></a> +<h2>LexerJSON</h2> +<p> + Subclass to implement some additional lexer dependent methods. +</p> +<h3>Derived from</h3> +Lexer, QsciLexerJSON +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#LexerJSON.__init__">LexerJSON</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#LexerJSON.defaultKeywords">defaultKeywords</a></td> +<td>Public method to get the default keywords.</td> +</tr><tr> +<td><a href="#LexerJSON.initProperties">initProperties</a></td> +<td>Public slot to initialize the properties.</td> +</tr><tr> +<td><a href="#LexerJSON.isCommentStyle">isCommentStyle</a></td> +<td>Public method to check, if a style is a comment style.</td> +</tr><tr> +<td><a href="#LexerJSON.isStringStyle">isStringStyle</a></td> +<td>Public method to check, if a style is a string style.</td> +</tr><tr> +<td><a href="#LexerJSON.maximumKeywordSet">maximumKeywordSet</a></td> +<td>Public method to get the maximum keyword set.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="LexerJSON.__init__" ID="LexerJSON.__init__"></a> +<h4>LexerJSON (Constructor)</h4> +<b>LexerJSON</b>(<i>parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>parent</i></dt> +<dd> +parent widget of this lexer +</dd> +</dl><a NAME="LexerJSON.defaultKeywords" ID="LexerJSON.defaultKeywords"></a> +<h4>LexerJSON.defaultKeywords</h4> +<b>defaultKeywords</b>(<i>kwSet</i>) +<p> + Public method to get the default keywords. +</p><dl> +<dt><i>kwSet</i></dt> +<dd> +number of the keyword set (integer) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +string giving the keywords (string) or None +</dd> +</dl><a NAME="LexerJSON.initProperties" ID="LexerJSON.initProperties"></a> +<h4>LexerJSON.initProperties</h4> +<b>initProperties</b>(<i></i>) +<p> + Public slot to initialize the properties. +</p><a NAME="LexerJSON.isCommentStyle" ID="LexerJSON.isCommentStyle"></a> +<h4>LexerJSON.isCommentStyle</h4> +<b>isCommentStyle</b>(<i>style</i>) +<p> + Public method to check, if a style is a comment style. +</p><dl> +<dt><i>style</i></dt> +<dd> +style to check (integer) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating a comment style (boolean) +</dd> +</dl><a NAME="LexerJSON.isStringStyle" ID="LexerJSON.isStringStyle"></a> +<h4>LexerJSON.isStringStyle</h4> +<b>isStringStyle</b>(<i>style</i>) +<p> + Public method to check, if a style is a string style. +</p><dl> +<dt><i>style</i></dt> +<dd> +style to check (integer) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating a string style (boolean) +</dd> +</dl><a NAME="LexerJSON.maximumKeywordSet" ID="LexerJSON.maximumKeywordSet"></a> +<h4>LexerJSON.maximumKeywordSet</h4> +<b>maximumKeywordSet</b>(<i></i>) +<p> + Public method to get the maximum keyword set. +</p><dl> +<dt>Returns:</dt> +<dd> +maximum keyword set (integer) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.QScintilla.Lexers.LexerMarkdown.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.QScintilla.Lexers.LexerMarkdown.html Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,99 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.QScintilla.Lexers.LexerMarkdown</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric6.QScintilla.Lexers.LexerMarkdown</h1> +<p> +Module implementing a Markdown lexer with some additional methods. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#LexerMarkdown">LexerMarkdown</a></td> +<td>Subclass to implement some additional lexer dependent methods.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="LexerMarkdown" ID="LexerMarkdown"></a> +<h2>LexerMarkdown</h2> +<p> + Subclass to implement some additional lexer dependent methods. +</p> +<h3>Derived from</h3> +Lexer, QsciLexerMarkdown +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#LexerMarkdown.__init__">LexerMarkdown</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#LexerMarkdown.defaultKeywords">defaultKeywords</a></td> +<td>Public method to get the default keywords.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="LexerMarkdown.__init__" ID="LexerMarkdown.__init__"></a> +<h4>LexerMarkdown (Constructor)</h4> +<b>LexerMarkdown</b>(<i>parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>parent</i></dt> +<dd> +parent widget of this lexer +</dd> +</dl><a NAME="LexerMarkdown.defaultKeywords" ID="LexerMarkdown.defaultKeywords"></a> +<h4>LexerMarkdown.defaultKeywords</h4> +<b>defaultKeywords</b>(<i>kwSet</i>) +<p> + Public method to get the default keywords. +</p><dl> +<dt><i>kwSet</i></dt> +<dd> +number of the keyword set (integer) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +string giving the keywords (string) or None +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.QScintilla.MarkupProviders.HtmlProvider.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.QScintilla.MarkupProviders.HtmlProvider.html Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,508 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.QScintilla.MarkupProviders.HtmlProvider</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric6.QScintilla.MarkupProviders.HtmlProvider</h1> +<p> +Module implementing the HTML markup provider. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HtmlProvider">HtmlProvider</a></td> +<td>Class implementing the HTML markup provider.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HtmlProvider" ID="HtmlProvider"></a> +<h2>HtmlProvider</h2> +<p> + Class implementing the HTML markup provider. +</p> +<h3>Derived from</h3> +MarkupBase +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HtmlProvider.__init__">HtmlProvider</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HtmlProvider.__insertMarkup">__insertMarkup</a></td> +<td>Private method to insert the specified markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.__makeList">__makeList</a></td> +<td>Private method to generate the desired list markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.bold">bold</a></td> +<td>Public method to generate bold text.</td> +</tr><tr> +<td><a href="#HtmlProvider.bulletedList">bulletedList</a></td> +<td>Public method to generate bulleted list text.</td> +</tr><tr> +<td><a href="#HtmlProvider.code">code</a></td> +<td>Public method to generate inline code text.</td> +</tr><tr> +<td><a href="#HtmlProvider.codeBlock">codeBlock</a></td> +<td>Public method to generate code block text.</td> +</tr><tr> +<td><a href="#HtmlProvider.hasBold">hasBold</a></td> +<td>Public method to indicate the availability of bold markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.hasBulletedList">hasBulletedList</a></td> +<td>Public method to indicate the availability of bulleted list markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.hasCode">hasCode</a></td> +<td>Public method to indicate the availability of inline code markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.hasCodeBlock">hasCodeBlock</a></td> +<td>Public method to indicate the availability of code block markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.hasHyperlink">hasHyperlink</a></td> +<td>Public method to indicate the availability of hyperlink markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.hasImage">hasImage</a></td> +<td>Public method to indicate the availability of image markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.hasItalic">hasItalic</a></td> +<td>Public method to indicate the availability of italic markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.hasLine">hasLine</a></td> +<td>Public method to indicate the availability of a horizontal line markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.hasNumberedList">hasNumberedList</a></td> +<td>Public method to indicate the availability of numbered list markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.hasQuote">hasQuote</a></td> +<td>Public method to indicate the availability of block quote markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.hasStrikethrough">hasStrikethrough</a></td> +<td>Public method to indicate the availability of strikethrough markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.header">header</a></td> +<td>Public method to generate a header.</td> +</tr><tr> +<td><a href="#HtmlProvider.headerLevels">headerLevels</a></td> +<td>Public method to determine the available header levels.</td> +</tr><tr> +<td><a href="#HtmlProvider.hyperlink">hyperlink</a></td> +<td>Public method to generate hyperlink text.</td> +</tr><tr> +<td><a href="#HtmlProvider.image">image</a></td> +<td>Public method to generate image text.</td> +</tr><tr> +<td><a href="#HtmlProvider.italic">italic</a></td> +<td>Public method to generate italic text.</td> +</tr><tr> +<td><a href="#HtmlProvider.kind">kind</a></td> +<td>Public method to get the markup kind.</td> +</tr><tr> +<td><a href="#HtmlProvider.line">line</a></td> +<td>Public method to generate a horizontal line text.</td> +</tr><tr> +<td><a href="#HtmlProvider.numberedList">numberedList</a></td> +<td>Public method to generate numbered list text.</td> +</tr><tr> +<td><a href="#HtmlProvider.quote">quote</a></td> +<td>Public method to generate block quote text.</td> +</tr><tr> +<td><a href="#HtmlProvider.strikethrough">strikethrough</a></td> +<td>Public method to generate strikethrough text.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HtmlProvider.__init__" ID="HtmlProvider.__init__"></a> +<h4>HtmlProvider (Constructor)</h4> +<b>HtmlProvider</b>(<i></i>) +<p> + Constructor +</p><a NAME="HtmlProvider.__insertMarkup" ID="HtmlProvider.__insertMarkup"></a> +<h4>HtmlProvider.__insertMarkup</h4> +<b>__insertMarkup</b>(<i>markup, editor, addEol=False</i>) +<p> + Private method to insert the specified markup. +</p><p> + If the editor has selected text, this text is enclosed by the given + markup. If no text is selected, the markup is inserted at the cursor + position and the cursor is positioned in between. +</p><dl> +<dt><i>markup</i> (str)</dt> +<dd> +markup string to be inserted +</dd><dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd><dt><i>addEol</i> (bool)</dt> +<dd> +flag indicating to add an eol string after the tag +</dd> +</dl><a NAME="HtmlProvider.__makeList" ID="HtmlProvider.__makeList"></a> +<h4>HtmlProvider.__makeList</h4> +<b>__makeList</b>(<i>editor, listType</i>) +<p> + Private method to generate the desired list markup. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd><dt><i>listType</i> (str)</dt> +<dd> +type of the desired list (should be ul or ol) +</dd> +</dl><a NAME="HtmlProvider.bold" ID="HtmlProvider.bold"></a> +<h4>HtmlProvider.bold</h4> +<b>bold</b>(<i>editor</i>) +<p> + Public method to generate bold text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="HtmlProvider.bulletedList" ID="HtmlProvider.bulletedList"></a> +<h4>HtmlProvider.bulletedList</h4> +<b>bulletedList</b>(<i>editor</i>) +<p> + Public method to generate bulleted list text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="HtmlProvider.code" ID="HtmlProvider.code"></a> +<h4>HtmlProvider.code</h4> +<b>code</b>(<i>editor</i>) +<p> + Public method to generate inline code text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="HtmlProvider.codeBlock" ID="HtmlProvider.codeBlock"></a> +<h4>HtmlProvider.codeBlock</h4> +<b>codeBlock</b>(<i>editor</i>) +<p> + Public method to generate code block text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="HtmlProvider.hasBold" ID="HtmlProvider.hasBold"></a> +<h4>HtmlProvider.hasBold</h4> +<b>hasBold</b>(<i></i>) +<p> + Public method to indicate the availability of bold markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of bold markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="HtmlProvider.hasBulletedList" ID="HtmlProvider.hasBulletedList"></a> +<h4>HtmlProvider.hasBulletedList</h4> +<b>hasBulletedList</b>(<i></i>) +<p> + Public method to indicate the availability of bulleted list markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of bulleted list markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="HtmlProvider.hasCode" ID="HtmlProvider.hasCode"></a> +<h4>HtmlProvider.hasCode</h4> +<b>hasCode</b>(<i></i>) +<p> + Public method to indicate the availability of inline code markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of inline code markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="HtmlProvider.hasCodeBlock" ID="HtmlProvider.hasCodeBlock"></a> +<h4>HtmlProvider.hasCodeBlock</h4> +<b>hasCodeBlock</b>(<i></i>) +<p> + Public method to indicate the availability of code block markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of code block markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="HtmlProvider.hasHyperlink" ID="HtmlProvider.hasHyperlink"></a> +<h4>HtmlProvider.hasHyperlink</h4> +<b>hasHyperlink</b>(<i></i>) +<p> + Public method to indicate the availability of hyperlink markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of hyperlink markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="HtmlProvider.hasImage" ID="HtmlProvider.hasImage"></a> +<h4>HtmlProvider.hasImage</h4> +<b>hasImage</b>(<i></i>) +<p> + Public method to indicate the availability of image markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of image markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="HtmlProvider.hasItalic" ID="HtmlProvider.hasItalic"></a> +<h4>HtmlProvider.hasItalic</h4> +<b>hasItalic</b>(<i></i>) +<p> + Public method to indicate the availability of italic markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of italic markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="HtmlProvider.hasLine" ID="HtmlProvider.hasLine"></a> +<h4>HtmlProvider.hasLine</h4> +<b>hasLine</b>(<i></i>) +<p> + Public method to indicate the availability of a horizontal line markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of a horizontal line markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="HtmlProvider.hasNumberedList" ID="HtmlProvider.hasNumberedList"></a> +<h4>HtmlProvider.hasNumberedList</h4> +<b>hasNumberedList</b>(<i></i>) +<p> + Public method to indicate the availability of numbered list markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of numbered list markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="HtmlProvider.hasQuote" ID="HtmlProvider.hasQuote"></a> +<h4>HtmlProvider.hasQuote</h4> +<b>hasQuote</b>(<i></i>) +<p> + Public method to indicate the availability of block quote markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of block quote markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="HtmlProvider.hasStrikethrough" ID="HtmlProvider.hasStrikethrough"></a> +<h4>HtmlProvider.hasStrikethrough</h4> +<b>hasStrikethrough</b>(<i></i>) +<p> + Public method to indicate the availability of strikethrough markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of strikethrough markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="HtmlProvider.header" ID="HtmlProvider.header"></a> +<h4>HtmlProvider.header</h4> +<b>header</b>(<i>editor, level</i>) +<p> + Public method to generate a header. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd><dt><i>level</i> (int)</dt> +<dd> +header level +</dd> +</dl><a NAME="HtmlProvider.headerLevels" ID="HtmlProvider.headerLevels"></a> +<h4>HtmlProvider.headerLevels</h4> +<b>headerLevels</b>(<i></i>) +<p> + Public method to determine the available header levels. +</p><dl> +<dt>Returns:</dt> +<dd> +supported header levels +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +int +</dd> +</dl><a NAME="HtmlProvider.hyperlink" ID="HtmlProvider.hyperlink"></a> +<h4>HtmlProvider.hyperlink</h4> +<b>hyperlink</b>(<i>editor</i>) +<p> + Public method to generate hyperlink text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="HtmlProvider.image" ID="HtmlProvider.image"></a> +<h4>HtmlProvider.image</h4> +<b>image</b>(<i>editor</i>) +<p> + Public method to generate image text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="HtmlProvider.italic" ID="HtmlProvider.italic"></a> +<h4>HtmlProvider.italic</h4> +<b>italic</b>(<i>editor</i>) +<p> + Public method to generate italic text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="HtmlProvider.kind" ID="HtmlProvider.kind"></a> +<h4>HtmlProvider.kind</h4> +<b>kind</b>(<i></i>) +<p> + Public method to get the markup kind. +</p><dl> +<dt>Returns:</dt> +<dd> +string with markup kind +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="HtmlProvider.line" ID="HtmlProvider.line"></a> +<h4>HtmlProvider.line</h4> +<b>line</b>(<i>editor</i>) +<p> + Public method to generate a horizontal line text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="HtmlProvider.numberedList" ID="HtmlProvider.numberedList"></a> +<h4>HtmlProvider.numberedList</h4> +<b>numberedList</b>(<i>editor</i>) +<p> + Public method to generate numbered list text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="HtmlProvider.quote" ID="HtmlProvider.quote"></a> +<h4>HtmlProvider.quote</h4> +<b>quote</b>(<i>editor</i>) +<p> + Public method to generate block quote text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="HtmlProvider.strikethrough" ID="HtmlProvider.strikethrough"></a> +<h4>HtmlProvider.strikethrough</h4> +<b>strikethrough</b>(<i>editor</i>) +<p> + Public method to generate strikethrough text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,145 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog</h1> +<p> +Module implementing a dialog to enter data to insert a hyperlink. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HyperlinkMarkupDialog">HyperlinkMarkupDialog</a></td> +<td>Class implementing a dialog to enter data to insert a hyperlink.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HyperlinkMarkupDialog" ID="HyperlinkMarkupDialog"></a> +<h2>HyperlinkMarkupDialog</h2> +<p> + Class implementing a dialog to enter data to insert a hyperlink. +</p> +<h3>Derived from</h3> +QDialog, Ui_HyperlinkMarkupDialog +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HyperlinkMarkupDialog.__init__">HyperlinkMarkupDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HyperlinkMarkupDialog.__updateOkButton">__updateOkButton</a></td> +<td>Private method to update the state of the OK button.</td> +</tr><tr> +<td><a href="#HyperlinkMarkupDialog.getData">getData</a></td> +<td>Public method to get the entered data.</td> +</tr><tr> +<td><a href="#HyperlinkMarkupDialog.on_targetEdit_textChanged">on_targetEdit_textChanged</a></td> +<td>Private slot handling a change of the link target.</td> +</tr><tr> +<td><a href="#HyperlinkMarkupDialog.on_textEdit_textChanged">on_textEdit_textChanged</a></td> +<td>Private slot handling a change of the link text.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HyperlinkMarkupDialog.__init__" ID="HyperlinkMarkupDialog.__init__"></a> +<h4>HyperlinkMarkupDialog (Constructor)</h4> +<b>HyperlinkMarkupDialog</b>(<i>textMayBeEmpty, targetMayBeEmpty, noTitle=False, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>textMayBeEmpty</i> (bool)</dt> +<dd> +flag indicating, that the link text may + be empty +</dd><dt><i>targetMayBeEmpty</i> (bool)</dt> +<dd> +flag indicating, that the link target may + be empty +</dd><dt><i>noTitle</i> (bool)</dt> +<dd> +flag indicating, that no title is supported +</dd><dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl><a NAME="HyperlinkMarkupDialog.__updateOkButton" ID="HyperlinkMarkupDialog.__updateOkButton"></a> +<h4>HyperlinkMarkupDialog.__updateOkButton</h4> +<b>__updateOkButton</b>(<i></i>) +<p> + Private method to update the state of the OK button. +</p><a NAME="HyperlinkMarkupDialog.getData" ID="HyperlinkMarkupDialog.getData"></a> +<h4>HyperlinkMarkupDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple containing the link text, link target and the optional + link title +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, str, str) +</dd> +</dl><a NAME="HyperlinkMarkupDialog.on_targetEdit_textChanged" ID="HyperlinkMarkupDialog.on_targetEdit_textChanged"></a> +<h4>HyperlinkMarkupDialog.on_targetEdit_textChanged</h4> +<b>on_targetEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot handling a change of the link target. +</p><dl> +<dt><i>txt</i> (str)</dt> +<dd> +link target +</dd> +</dl><a NAME="HyperlinkMarkupDialog.on_textEdit_textChanged" ID="HyperlinkMarkupDialog.on_textEdit_textChanged"></a> +<h4>HyperlinkMarkupDialog.on_textEdit_textChanged</h4> +<b>on_textEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot handling a change of the link text. +</p><dl> +<dt><i>txt</i> (str)</dt> +<dd> +link text +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,189 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.QScintilla.MarkupProviders.ImageMarkupDialog</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric6.QScintilla.MarkupProviders.ImageMarkupDialog</h1> +<p> +Module implementing a dialog to enter data for an image markup. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#ImageMarkupDialog">ImageMarkupDialog</a></td> +<td>Class implementing a dialog to enter data for an image markup.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="ImageMarkupDialog" ID="ImageMarkupDialog"></a> +<h2>ImageMarkupDialog</h2> +<p> + Class implementing a dialog to enter data for an image markup. +</p> +<h3>Derived from</h3> +QDialog, Ui_ImageMarkupDialog +<h3>Class Attributes</h3> +<table> +<tr><td>HtmlMode</td></tr><tr><td>MarkDownMode</td></tr><tr><td>RestMode</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#ImageMarkupDialog.__init__">ImageMarkupDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#ImageMarkupDialog.__updateOkButton">__updateOkButton</a></td> +<td>Private slot to set the state of the OK button.</td> +</tr><tr> +<td><a href="#ImageMarkupDialog.getData">getData</a></td> +<td>Public method to get the entered data.</td> +</tr><tr> +<td><a href="#ImageMarkupDialog.on_altTextEdit_textChanged">on_altTextEdit_textChanged</a></td> +<td>Private slot handling changes of the alternative text.</td> +</tr><tr> +<td><a href="#ImageMarkupDialog.on_aspectRatioCheckBox_toggled">on_aspectRatioCheckBox_toggled</a></td> +<td>Private slot to adjust the height to match the original aspect ratio.</td> +</tr><tr> +<td><a href="#ImageMarkupDialog.on_heightSpinBox_valueChanged">on_heightSpinBox_valueChanged</a></td> +<td>Private slot to adjust the width spin box.</td> +</tr><tr> +<td><a href="#ImageMarkupDialog.on_imagePicker_textChanged">on_imagePicker_textChanged</a></td> +<td>Private slot handling changes of the image path.</td> +</tr><tr> +<td><a href="#ImageMarkupDialog.on_sizeCheckBox_toggled">on_sizeCheckBox_toggled</a></td> +<td>Private slot to reset the width and height spin boxes.</td> +</tr><tr> +<td><a href="#ImageMarkupDialog.on_widthSpinBox_valueChanged">on_widthSpinBox_valueChanged</a></td> +<td>Private slot to adjust the height spin box.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="ImageMarkupDialog.__init__" ID="ImageMarkupDialog.__init__"></a> +<h4>ImageMarkupDialog (Constructor)</h4> +<b>ImageMarkupDialog</b>(<i>mode, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>mode</i> (int)</dt> +<dd> +mode of the dialog +</dd><dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl><a NAME="ImageMarkupDialog.__updateOkButton" ID="ImageMarkupDialog.__updateOkButton"></a> +<h4>ImageMarkupDialog.__updateOkButton</h4> +<b>__updateOkButton</b>(<i></i>) +<p> + Private slot to set the state of the OK button. +</p><a NAME="ImageMarkupDialog.getData" ID="ImageMarkupDialog.getData"></a> +<h4>ImageMarkupDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple containing the image address, alternative text, + title text, flag to keep the original size, width and height +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, str, str, bool, int, int) +</dd> +</dl><a NAME="ImageMarkupDialog.on_altTextEdit_textChanged" ID="ImageMarkupDialog.on_altTextEdit_textChanged"></a> +<h4>ImageMarkupDialog.on_altTextEdit_textChanged</h4> +<b>on_altTextEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot handling changes of the alternative text. +</p><dl> +<dt><i>txt</i> (str)</dt> +<dd> +alternative text +</dd> +</dl><a NAME="ImageMarkupDialog.on_aspectRatioCheckBox_toggled" ID="ImageMarkupDialog.on_aspectRatioCheckBox_toggled"></a> +<h4>ImageMarkupDialog.on_aspectRatioCheckBox_toggled</h4> +<b>on_aspectRatioCheckBox_toggled</b>(<i>checked</i>) +<p> + Private slot to adjust the height to match the original aspect ratio. +</p><dl> +<dt><i>checked</i> (bool)</dt> +<dd> +flag indicating the state of the check box +</dd> +</dl><a NAME="ImageMarkupDialog.on_heightSpinBox_valueChanged" ID="ImageMarkupDialog.on_heightSpinBox_valueChanged"></a> +<h4>ImageMarkupDialog.on_heightSpinBox_valueChanged</h4> +<b>on_heightSpinBox_valueChanged</b>(<i>height</i>) +<p> + Private slot to adjust the width spin box. +</p><dl> +<dt><i>height</i> (int)</dt> +<dd> +height for the image +</dd> +</dl><a NAME="ImageMarkupDialog.on_imagePicker_textChanged" ID="ImageMarkupDialog.on_imagePicker_textChanged"></a> +<h4>ImageMarkupDialog.on_imagePicker_textChanged</h4> +<b>on_imagePicker_textChanged</b>(<i>address</i>) +<p> + Private slot handling changes of the image path. +</p><dl> +<dt><i>address</i> (str)</dt> +<dd> +image address (URL or local path) +</dd> +</dl><a NAME="ImageMarkupDialog.on_sizeCheckBox_toggled" ID="ImageMarkupDialog.on_sizeCheckBox_toggled"></a> +<h4>ImageMarkupDialog.on_sizeCheckBox_toggled</h4> +<b>on_sizeCheckBox_toggled</b>(<i>checked</i>) +<p> + Private slot to reset the width and height spin boxes. +</p><dl> +<dt><i>checked</i> (bool)</dt> +<dd> +flag indicating the state of the check box +</dd> +</dl><a NAME="ImageMarkupDialog.on_widthSpinBox_valueChanged" ID="ImageMarkupDialog.on_widthSpinBox_valueChanged"></a> +<h4>ImageMarkupDialog.on_widthSpinBox_valueChanged</h4> +<b>on_widthSpinBox_valueChanged</b>(<i>width</i>) +<p> + Private slot to adjust the height spin box. +</p><dl> +<dt><i>width</i> (int)</dt> +<dd> +width for the image +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.QScintilla.MarkupProviders.MarkdownProvider.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.QScintilla.MarkupProviders.MarkdownProvider.html Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,505 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.QScintilla.MarkupProviders.MarkdownProvider</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric6.QScintilla.MarkupProviders.MarkdownProvider</h1> +<p> +Module implementing the Markdown markup provider. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#MarkdownProvider">MarkdownProvider</a></td> +<td>Class implementing the Markdown markup provider.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="MarkdownProvider" ID="MarkdownProvider"></a> +<h2>MarkdownProvider</h2> +<p> + Class implementing the Markdown markup provider. +</p> +<h3>Derived from</h3> +MarkupBase +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#MarkdownProvider.__init__">MarkdownProvider</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#MarkdownProvider.__insertMarkup">__insertMarkup</a></td> +<td>Private method to insert the specified markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.__makeList">__makeList</a></td> +<td>Private method to generate the desired list markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.bold">bold</a></td> +<td>Public method to generate bold text.</td> +</tr><tr> +<td><a href="#MarkdownProvider.bulletedList">bulletedList</a></td> +<td>Public method to generate bulleted list text.</td> +</tr><tr> +<td><a href="#MarkdownProvider.code">code</a></td> +<td>Public method to generate inline code text.</td> +</tr><tr> +<td><a href="#MarkdownProvider.codeBlock">codeBlock</a></td> +<td>Public method to generate code block text.</td> +</tr><tr> +<td><a href="#MarkdownProvider.hasBold">hasBold</a></td> +<td>Public method to indicate the availability of bold markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.hasBulletedList">hasBulletedList</a></td> +<td>Public method to indicate the availability of bulleted list markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.hasCode">hasCode</a></td> +<td>Public method to indicate the availability of inline code markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.hasCodeBlock">hasCodeBlock</a></td> +<td>Public method to indicate the availability of code block markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.hasHyperlink">hasHyperlink</a></td> +<td>Public method to indicate the availability of hyperlink markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.hasImage">hasImage</a></td> +<td>Public method to indicate the availability of image markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.hasItalic">hasItalic</a></td> +<td>Public method to indicate the availability of italic markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.hasLine">hasLine</a></td> +<td>Public method to indicate the availability of a horizontal line markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.hasNumberedList">hasNumberedList</a></td> +<td>Public method to indicate the availability of numbered list markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.hasQuote">hasQuote</a></td> +<td>Public method to indicate the availability of block quote markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.hasStrikethrough">hasStrikethrough</a></td> +<td>Public method to indicate the availability of strikethrough markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.header">header</a></td> +<td>Public method to generate a header.</td> +</tr><tr> +<td><a href="#MarkdownProvider.headerLevels">headerLevels</a></td> +<td>Public method to determine the available header levels.</td> +</tr><tr> +<td><a href="#MarkdownProvider.hyperlink">hyperlink</a></td> +<td>Public method to generate hyperlink text.</td> +</tr><tr> +<td><a href="#MarkdownProvider.image">image</a></td> +<td>Public method to generate image text.</td> +</tr><tr> +<td><a href="#MarkdownProvider.italic">italic</a></td> +<td>Public method to generate italic text.</td> +</tr><tr> +<td><a href="#MarkdownProvider.kind">kind</a></td> +<td>Public method to get the markup kind.</td> +</tr><tr> +<td><a href="#MarkdownProvider.line">line</a></td> +<td>Public method to generate a horizontal line text.</td> +</tr><tr> +<td><a href="#MarkdownProvider.numberedList">numberedList</a></td> +<td>Public method to generate numbered list text.</td> +</tr><tr> +<td><a href="#MarkdownProvider.quote">quote</a></td> +<td>Public method to generate block quote text.</td> +</tr><tr> +<td><a href="#MarkdownProvider.strikethrough">strikethrough</a></td> +<td>Public method to generate strikethrough text.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="MarkdownProvider.__init__" ID="MarkdownProvider.__init__"></a> +<h4>MarkdownProvider (Constructor)</h4> +<b>MarkdownProvider</b>(<i></i>) +<p> + Constructor +</p><a NAME="MarkdownProvider.__insertMarkup" ID="MarkdownProvider.__insertMarkup"></a> +<h4>MarkdownProvider.__insertMarkup</h4> +<b>__insertMarkup</b>(<i>markup, editor</i>) +<p> + Private method to insert the specified markup. +</p><p> + If the editor has selected text, this text is enclosed by the given + markup. If no text is selected, the markup is inserted at the cursor + position and the cursor is positioned in between. +</p><dl> +<dt><i>markup</i> (str)</dt> +<dd> +markup string to be inserted +</dd><dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkdownProvider.__makeList" ID="MarkdownProvider.__makeList"></a> +<h4>MarkdownProvider.__makeList</h4> +<b>__makeList</b>(<i>editor, numberedList</i>) +<p> + Private method to generate the desired list markup. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd><dt><i>numberedList</i> (bool)</dt> +<dd> +flag indicating the generation of a numbered list +</dd> +</dl><a NAME="MarkdownProvider.bold" ID="MarkdownProvider.bold"></a> +<h4>MarkdownProvider.bold</h4> +<b>bold</b>(<i>editor</i>) +<p> + Public method to generate bold text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkdownProvider.bulletedList" ID="MarkdownProvider.bulletedList"></a> +<h4>MarkdownProvider.bulletedList</h4> +<b>bulletedList</b>(<i>editor</i>) +<p> + Public method to generate bulleted list text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkdownProvider.code" ID="MarkdownProvider.code"></a> +<h4>MarkdownProvider.code</h4> +<b>code</b>(<i>editor</i>) +<p> + Public method to generate inline code text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkdownProvider.codeBlock" ID="MarkdownProvider.codeBlock"></a> +<h4>MarkdownProvider.codeBlock</h4> +<b>codeBlock</b>(<i>editor</i>) +<p> + Public method to generate code block text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkdownProvider.hasBold" ID="MarkdownProvider.hasBold"></a> +<h4>MarkdownProvider.hasBold</h4> +<b>hasBold</b>(<i></i>) +<p> + Public method to indicate the availability of bold markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of bold markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkdownProvider.hasBulletedList" ID="MarkdownProvider.hasBulletedList"></a> +<h4>MarkdownProvider.hasBulletedList</h4> +<b>hasBulletedList</b>(<i></i>) +<p> + Public method to indicate the availability of bulleted list markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of bulleted list markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkdownProvider.hasCode" ID="MarkdownProvider.hasCode"></a> +<h4>MarkdownProvider.hasCode</h4> +<b>hasCode</b>(<i></i>) +<p> + Public method to indicate the availability of inline code markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of inline code markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkdownProvider.hasCodeBlock" ID="MarkdownProvider.hasCodeBlock"></a> +<h4>MarkdownProvider.hasCodeBlock</h4> +<b>hasCodeBlock</b>(<i></i>) +<p> + Public method to indicate the availability of code block markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of code block markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkdownProvider.hasHyperlink" ID="MarkdownProvider.hasHyperlink"></a> +<h4>MarkdownProvider.hasHyperlink</h4> +<b>hasHyperlink</b>(<i></i>) +<p> + Public method to indicate the availability of hyperlink markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of hyperlink markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkdownProvider.hasImage" ID="MarkdownProvider.hasImage"></a> +<h4>MarkdownProvider.hasImage</h4> +<b>hasImage</b>(<i></i>) +<p> + Public method to indicate the availability of image markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of image markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkdownProvider.hasItalic" ID="MarkdownProvider.hasItalic"></a> +<h4>MarkdownProvider.hasItalic</h4> +<b>hasItalic</b>(<i></i>) +<p> + Public method to indicate the availability of italic markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of italic markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkdownProvider.hasLine" ID="MarkdownProvider.hasLine"></a> +<h4>MarkdownProvider.hasLine</h4> +<b>hasLine</b>(<i></i>) +<p> + Public method to indicate the availability of a horizontal line markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of a horizontal line markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkdownProvider.hasNumberedList" ID="MarkdownProvider.hasNumberedList"></a> +<h4>MarkdownProvider.hasNumberedList</h4> +<b>hasNumberedList</b>(<i></i>) +<p> + Public method to indicate the availability of numbered list markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of numbered list markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkdownProvider.hasQuote" ID="MarkdownProvider.hasQuote"></a> +<h4>MarkdownProvider.hasQuote</h4> +<b>hasQuote</b>(<i></i>) +<p> + Public method to indicate the availability of block quote markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of block quote markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkdownProvider.hasStrikethrough" ID="MarkdownProvider.hasStrikethrough"></a> +<h4>MarkdownProvider.hasStrikethrough</h4> +<b>hasStrikethrough</b>(<i></i>) +<p> + Public method to indicate the availability of strikethrough markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of strikethrough markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkdownProvider.header" ID="MarkdownProvider.header"></a> +<h4>MarkdownProvider.header</h4> +<b>header</b>(<i>editor, level</i>) +<p> + Public method to generate a header. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd><dt><i>level</i> (int)</dt> +<dd> +header level +</dd> +</dl><a NAME="MarkdownProvider.headerLevels" ID="MarkdownProvider.headerLevels"></a> +<h4>MarkdownProvider.headerLevels</h4> +<b>headerLevels</b>(<i></i>) +<p> + Public method to determine the available header levels. +</p><dl> +<dt>Returns:</dt> +<dd> +supported header levels +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +int +</dd> +</dl><a NAME="MarkdownProvider.hyperlink" ID="MarkdownProvider.hyperlink"></a> +<h4>MarkdownProvider.hyperlink</h4> +<b>hyperlink</b>(<i>editor</i>) +<p> + Public method to generate hyperlink text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkdownProvider.image" ID="MarkdownProvider.image"></a> +<h4>MarkdownProvider.image</h4> +<b>image</b>(<i>editor</i>) +<p> + Public method to generate image text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkdownProvider.italic" ID="MarkdownProvider.italic"></a> +<h4>MarkdownProvider.italic</h4> +<b>italic</b>(<i>editor</i>) +<p> + Public method to generate italic text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkdownProvider.kind" ID="MarkdownProvider.kind"></a> +<h4>MarkdownProvider.kind</h4> +<b>kind</b>(<i></i>) +<p> + Public method to get the markup kind. +</p><dl> +<dt>Returns:</dt> +<dd> +string with markup kind +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="MarkdownProvider.line" ID="MarkdownProvider.line"></a> +<h4>MarkdownProvider.line</h4> +<b>line</b>(<i>editor</i>) +<p> + Public method to generate a horizontal line text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkdownProvider.numberedList" ID="MarkdownProvider.numberedList"></a> +<h4>MarkdownProvider.numberedList</h4> +<b>numberedList</b>(<i>editor</i>) +<p> + Public method to generate numbered list text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkdownProvider.quote" ID="MarkdownProvider.quote"></a> +<h4>MarkdownProvider.quote</h4> +<b>quote</b>(<i>editor</i>) +<p> + Public method to generate block quote text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkdownProvider.strikethrough" ID="MarkdownProvider.strikethrough"></a> +<h4>MarkdownProvider.strikethrough</h4> +<b>strikethrough</b>(<i>editor</i>) +<p> + Public method to generate strikethrough text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.QScintilla.MarkupProviders.MarkupBase.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.QScintilla.MarkupProviders.MarkupBase.html Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,473 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.QScintilla.MarkupProviders.MarkupBase</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric6.QScintilla.MarkupProviders.MarkupBase</h1> +<p> +Module implementing the base class for the markup providers. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#MarkupBase">MarkupBase</a></td> +<td>Class implementing the base class for the markup providers.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="MarkupBase" ID="MarkupBase"></a> +<h2>MarkupBase</h2> +<p> + Class implementing the base class for the markup providers. +</p><p> + Note: Derived classes need only implement those method they provide + functionality for. This base class implements do nothing variants for + all methods. +</p> +<h3>Derived from</h3> +object +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#MarkupBase.__init__">MarkupBase</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#MarkupBase.bold">bold</a></td> +<td>Public method to generate bold text.</td> +</tr><tr> +<td><a href="#MarkupBase.bulletedList">bulletedList</a></td> +<td>Public method to generate bulleted list text.</td> +</tr><tr> +<td><a href="#MarkupBase.code">code</a></td> +<td>Public method to generate inline code text.</td> +</tr><tr> +<td><a href="#MarkupBase.codeBlock">codeBlock</a></td> +<td>Public method to generate code block text.</td> +</tr><tr> +<td><a href="#MarkupBase.hasBold">hasBold</a></td> +<td>Public method to indicate the availability of bold markup.</td> +</tr><tr> +<td><a href="#MarkupBase.hasBulletedList">hasBulletedList</a></td> +<td>Public method to indicate the availability of bulleted list markup.</td> +</tr><tr> +<td><a href="#MarkupBase.hasCode">hasCode</a></td> +<td>Public method to indicate the availability of inline code markup.</td> +</tr><tr> +<td><a href="#MarkupBase.hasCodeBlock">hasCodeBlock</a></td> +<td>Public method to indicate the availability of code block markup.</td> +</tr><tr> +<td><a href="#MarkupBase.hasHyperlink">hasHyperlink</a></td> +<td>Public method to indicate the availability of hyperlink markup.</td> +</tr><tr> +<td><a href="#MarkupBase.hasImage">hasImage</a></td> +<td>Public method to indicate the availability of image markup.</td> +</tr><tr> +<td><a href="#MarkupBase.hasItalic">hasItalic</a></td> +<td>Public method to indicate the availability of italic markup.</td> +</tr><tr> +<td><a href="#MarkupBase.hasLine">hasLine</a></td> +<td>Public method to indicate the availability of a horizontal line markup.</td> +</tr><tr> +<td><a href="#MarkupBase.hasNumberedList">hasNumberedList</a></td> +<td>Public method to indicate the availability of numbered list markup.</td> +</tr><tr> +<td><a href="#MarkupBase.hasQuote">hasQuote</a></td> +<td>Public method to indicate the availability of block quote markup.</td> +</tr><tr> +<td><a href="#MarkupBase.hasStrikethrough">hasStrikethrough</a></td> +<td>Public method to indicate the availability of strikethrough markup.</td> +</tr><tr> +<td><a href="#MarkupBase.header">header</a></td> +<td>Public method to generate a header.</td> +</tr><tr> +<td><a href="#MarkupBase.headerLevels">headerLevels</a></td> +<td>Public method to determine the available header levels.</td> +</tr><tr> +<td><a href="#MarkupBase.hyperlink">hyperlink</a></td> +<td>Public method to generate hyperlink text.</td> +</tr><tr> +<td><a href="#MarkupBase.image">image</a></td> +<td>Public method to generate image text.</td> +</tr><tr> +<td><a href="#MarkupBase.italic">italic</a></td> +<td>Public method to generate italic text.</td> +</tr><tr> +<td><a href="#MarkupBase.kind">kind</a></td> +<td>Public method to get the markup kind.</td> +</tr><tr> +<td><a href="#MarkupBase.line">line</a></td> +<td>Public method to generate a horizontal line text.</td> +</tr><tr> +<td><a href="#MarkupBase.numberedList">numberedList</a></td> +<td>Public method to generate numbered list text.</td> +</tr><tr> +<td><a href="#MarkupBase.quote">quote</a></td> +<td>Public method to generate block quote text.</td> +</tr><tr> +<td><a href="#MarkupBase.strikethrough">strikethrough</a></td> +<td>Public method to generate strikethrough text.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="MarkupBase.__init__" ID="MarkupBase.__init__"></a> +<h4>MarkupBase (Constructor)</h4> +<b>MarkupBase</b>(<i></i>) +<p> + Constructor +</p><a NAME="MarkupBase.bold" ID="MarkupBase.bold"></a> +<h4>MarkupBase.bold</h4> +<b>bold</b>(<i>editor</i>) +<p> + Public method to generate bold text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkupBase.bulletedList" ID="MarkupBase.bulletedList"></a> +<h4>MarkupBase.bulletedList</h4> +<b>bulletedList</b>(<i>editor</i>) +<p> + Public method to generate bulleted list text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkupBase.code" ID="MarkupBase.code"></a> +<h4>MarkupBase.code</h4> +<b>code</b>(<i>editor</i>) +<p> + Public method to generate inline code text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkupBase.codeBlock" ID="MarkupBase.codeBlock"></a> +<h4>MarkupBase.codeBlock</h4> +<b>codeBlock</b>(<i>editor</i>) +<p> + Public method to generate code block text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkupBase.hasBold" ID="MarkupBase.hasBold"></a> +<h4>MarkupBase.hasBold</h4> +<b>hasBold</b>(<i></i>) +<p> + Public method to indicate the availability of bold markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of bold markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkupBase.hasBulletedList" ID="MarkupBase.hasBulletedList"></a> +<h4>MarkupBase.hasBulletedList</h4> +<b>hasBulletedList</b>(<i></i>) +<p> + Public method to indicate the availability of bulleted list markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of bulleted list markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkupBase.hasCode" ID="MarkupBase.hasCode"></a> +<h4>MarkupBase.hasCode</h4> +<b>hasCode</b>(<i></i>) +<p> + Public method to indicate the availability of inline code markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of inline code markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkupBase.hasCodeBlock" ID="MarkupBase.hasCodeBlock"></a> +<h4>MarkupBase.hasCodeBlock</h4> +<b>hasCodeBlock</b>(<i></i>) +<p> + Public method to indicate the availability of code block markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of code block markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkupBase.hasHyperlink" ID="MarkupBase.hasHyperlink"></a> +<h4>MarkupBase.hasHyperlink</h4> +<b>hasHyperlink</b>(<i></i>) +<p> + Public method to indicate the availability of hyperlink markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of hyperlink markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkupBase.hasImage" ID="MarkupBase.hasImage"></a> +<h4>MarkupBase.hasImage</h4> +<b>hasImage</b>(<i></i>) +<p> + Public method to indicate the availability of image markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of image markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkupBase.hasItalic" ID="MarkupBase.hasItalic"></a> +<h4>MarkupBase.hasItalic</h4> +<b>hasItalic</b>(<i></i>) +<p> + Public method to indicate the availability of italic markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of italic markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkupBase.hasLine" ID="MarkupBase.hasLine"></a> +<h4>MarkupBase.hasLine</h4> +<b>hasLine</b>(<i></i>) +<p> + Public method to indicate the availability of a horizontal line markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of a horizontal line markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkupBase.hasNumberedList" ID="MarkupBase.hasNumberedList"></a> +<h4>MarkupBase.hasNumberedList</h4> +<b>hasNumberedList</b>(<i></i>) +<p> + Public method to indicate the availability of numbered list markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of numbered list markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkupBase.hasQuote" ID="MarkupBase.hasQuote"></a> +<h4>MarkupBase.hasQuote</h4> +<b>hasQuote</b>(<i></i>) +<p> + Public method to indicate the availability of block quote markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of block quote markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkupBase.hasStrikethrough" ID="MarkupBase.hasStrikethrough"></a> +<h4>MarkupBase.hasStrikethrough</h4> +<b>hasStrikethrough</b>(<i></i>) +<p> + Public method to indicate the availability of strikethrough markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of strikethrough markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkupBase.header" ID="MarkupBase.header"></a> +<h4>MarkupBase.header</h4> +<b>header</b>(<i>editor, level</i>) +<p> + Public method to generate a header. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd><dt><i>level</i> (int)</dt> +<dd> +header level +</dd> +</dl><a NAME="MarkupBase.headerLevels" ID="MarkupBase.headerLevels"></a> +<h4>MarkupBase.headerLevels</h4> +<b>headerLevels</b>(<i></i>) +<p> + Public method to determine the available header levels. +</p><dl> +<dt>Returns:</dt> +<dd> +supported header levels +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +int +</dd> +</dl><a NAME="MarkupBase.hyperlink" ID="MarkupBase.hyperlink"></a> +<h4>MarkupBase.hyperlink</h4> +<b>hyperlink</b>(<i>editor</i>) +<p> + Public method to generate hyperlink text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkupBase.image" ID="MarkupBase.image"></a> +<h4>MarkupBase.image</h4> +<b>image</b>(<i>editor</i>) +<p> + Public method to generate image text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkupBase.italic" ID="MarkupBase.italic"></a> +<h4>MarkupBase.italic</h4> +<b>italic</b>(<i>editor</i>) +<p> + Public method to generate italic text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkupBase.kind" ID="MarkupBase.kind"></a> +<h4>MarkupBase.kind</h4> +<b>kind</b>(<i></i>) +<p> + Public method to get the markup kind. +</p><dl> +<dt>Returns:</dt> +<dd> +markup kind all lowercased +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="MarkupBase.line" ID="MarkupBase.line"></a> +<h4>MarkupBase.line</h4> +<b>line</b>(<i>editor</i>) +<p> + Public method to generate a horizontal line text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkupBase.numberedList" ID="MarkupBase.numberedList"></a> +<h4>MarkupBase.numberedList</h4> +<b>numberedList</b>(<i>editor</i>) +<p> + Public method to generate numbered list text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkupBase.quote" ID="MarkupBase.quote"></a> +<h4>MarkupBase.quote</h4> +<b>quote</b>(<i>editor</i>) +<p> + Public method to generate block quote text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkupBase.strikethrough" ID="MarkupBase.strikethrough"></a> +<h4>MarkupBase.strikethrough</h4> +<b>strikethrough</b>(<i>editor</i>) +<p> + Public method to generate strikethrough text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,474 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.QScintilla.MarkupProviders.RestructuredTextProvider</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric6.QScintilla.MarkupProviders.RestructuredTextProvider</h1> +<p> +Module implementing the reStructured Text markup provider. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#RestructuredTextProvider">RestructuredTextProvider</a></td> +<td>Class implementing the reStructured Text markup provider.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="RestructuredTextProvider" ID="RestructuredTextProvider"></a> +<h2>RestructuredTextProvider</h2> +<p> + Class implementing the reStructured Text markup provider. +</p> +<h3>Derived from</h3> +MarkupBase +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#RestructuredTextProvider.__init__">RestructuredTextProvider</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.__insertMarkup">__insertMarkup</a></td> +<td>Private method to insert the specified markup.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.__makeList">__makeList</a></td> +<td>Private method to generate the desired list markup.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.bold">bold</a></td> +<td>Public method to generate bold text.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.bulletedList">bulletedList</a></td> +<td>Public method to generate bulleted list text.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.code">code</a></td> +<td>Public method to generate inline code text.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.codeBlock">codeBlock</a></td> +<td>Public method to generate code block text.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.hasBold">hasBold</a></td> +<td>Public method to indicate the availability of bold markup.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.hasBulletedList">hasBulletedList</a></td> +<td>Public method to indicate the availability of bulleted list markup.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.hasCode">hasCode</a></td> +<td>Public method to indicate the availability of inline code markup.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.hasCodeBlock">hasCodeBlock</a></td> +<td>Public method to indicate the availability of code block markup.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.hasHyperlink">hasHyperlink</a></td> +<td>Public method to indicate the availability of hyperlink markup.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.hasImage">hasImage</a></td> +<td>Public method to indicate the availability of image markup.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.hasItalic">hasItalic</a></td> +<td>Public method to indicate the availability of italic markup.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.hasLine">hasLine</a></td> +<td>Public method to indicate the availability of a horizontal line markup.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.hasNumberedList">hasNumberedList</a></td> +<td>Public method to indicate the availability of numbered list markup.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.hasQuote">hasQuote</a></td> +<td>Public method to indicate the availability of block quote markup.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.header">header</a></td> +<td>Public method to generate a header.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.headerLevels">headerLevels</a></td> +<td>Public method to determine the available header levels.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.hyperlink">hyperlink</a></td> +<td>Public method to generate hyperlink text.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.image">image</a></td> +<td>Public method to generate image text.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.italic">italic</a></td> +<td>Public method to generate italic text.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.kind">kind</a></td> +<td>Public method to get the markup kind.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.line">line</a></td> +<td>Public method to generate a horizontal line text.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.numberedList">numberedList</a></td> +<td>Public method to generate numbered list text.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.quote">quote</a></td> +<td>Public method to generate block quote text.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="RestructuredTextProvider.__init__" ID="RestructuredTextProvider.__init__"></a> +<h4>RestructuredTextProvider (Constructor)</h4> +<b>RestructuredTextProvider</b>(<i></i>) +<p> + Constructor +</p><a NAME="RestructuredTextProvider.__insertMarkup" ID="RestructuredTextProvider.__insertMarkup"></a> +<h4>RestructuredTextProvider.__insertMarkup</h4> +<b>__insertMarkup</b>(<i>markup, editor</i>) +<p> + Private method to insert the specified markup. +</p><p> + If the editor has selected text, this text is enclosed by the given + markup. If no text is selected, the markup is inserted at the cursor + position and the cursor is positioned in between. +</p><dl> +<dt><i>markup</i> (str)</dt> +<dd> +markup string to be inserted +</dd><dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="RestructuredTextProvider.__makeList" ID="RestructuredTextProvider.__makeList"></a> +<h4>RestructuredTextProvider.__makeList</h4> +<b>__makeList</b>(<i>editor, numberedList</i>) +<p> + Private method to generate the desired list markup. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd><dt><i>numberedList</i> (bool)</dt> +<dd> +flag indicating the generation of a numbered list +</dd> +</dl><a NAME="RestructuredTextProvider.bold" ID="RestructuredTextProvider.bold"></a> +<h4>RestructuredTextProvider.bold</h4> +<b>bold</b>(<i>editor</i>) +<p> + Public method to generate bold text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="RestructuredTextProvider.bulletedList" ID="RestructuredTextProvider.bulletedList"></a> +<h4>RestructuredTextProvider.bulletedList</h4> +<b>bulletedList</b>(<i>editor</i>) +<p> + Public method to generate bulleted list text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="RestructuredTextProvider.code" ID="RestructuredTextProvider.code"></a> +<h4>RestructuredTextProvider.code</h4> +<b>code</b>(<i>editor</i>) +<p> + Public method to generate inline code text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="RestructuredTextProvider.codeBlock" ID="RestructuredTextProvider.codeBlock"></a> +<h4>RestructuredTextProvider.codeBlock</h4> +<b>codeBlock</b>(<i>editor</i>) +<p> + Public method to generate code block text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="RestructuredTextProvider.hasBold" ID="RestructuredTextProvider.hasBold"></a> +<h4>RestructuredTextProvider.hasBold</h4> +<b>hasBold</b>(<i></i>) +<p> + Public method to indicate the availability of bold markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of bold markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="RestructuredTextProvider.hasBulletedList" ID="RestructuredTextProvider.hasBulletedList"></a> +<h4>RestructuredTextProvider.hasBulletedList</h4> +<b>hasBulletedList</b>(<i></i>) +<p> + Public method to indicate the availability of bulleted list markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of bulleted list markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="RestructuredTextProvider.hasCode" ID="RestructuredTextProvider.hasCode"></a> +<h4>RestructuredTextProvider.hasCode</h4> +<b>hasCode</b>(<i></i>) +<p> + Public method to indicate the availability of inline code markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of inline code markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="RestructuredTextProvider.hasCodeBlock" ID="RestructuredTextProvider.hasCodeBlock"></a> +<h4>RestructuredTextProvider.hasCodeBlock</h4> +<b>hasCodeBlock</b>(<i></i>) +<p> + Public method to indicate the availability of code block markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of code block markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="RestructuredTextProvider.hasHyperlink" ID="RestructuredTextProvider.hasHyperlink"></a> +<h4>RestructuredTextProvider.hasHyperlink</h4> +<b>hasHyperlink</b>(<i></i>) +<p> + Public method to indicate the availability of hyperlink markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of hyperlink markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="RestructuredTextProvider.hasImage" ID="RestructuredTextProvider.hasImage"></a> +<h4>RestructuredTextProvider.hasImage</h4> +<b>hasImage</b>(<i></i>) +<p> + Public method to indicate the availability of image markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of image markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="RestructuredTextProvider.hasItalic" ID="RestructuredTextProvider.hasItalic"></a> +<h4>RestructuredTextProvider.hasItalic</h4> +<b>hasItalic</b>(<i></i>) +<p> + Public method to indicate the availability of italic markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of italic markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="RestructuredTextProvider.hasLine" ID="RestructuredTextProvider.hasLine"></a> +<h4>RestructuredTextProvider.hasLine</h4> +<b>hasLine</b>(<i></i>) +<p> + Public method to indicate the availability of a horizontal line markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of a horizontal line markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="RestructuredTextProvider.hasNumberedList" ID="RestructuredTextProvider.hasNumberedList"></a> +<h4>RestructuredTextProvider.hasNumberedList</h4> +<b>hasNumberedList</b>(<i></i>) +<p> + Public method to indicate the availability of numbered list markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of numbered list markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="RestructuredTextProvider.hasQuote" ID="RestructuredTextProvider.hasQuote"></a> +<h4>RestructuredTextProvider.hasQuote</h4> +<b>hasQuote</b>(<i></i>) +<p> + Public method to indicate the availability of block quote markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of block quote markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="RestructuredTextProvider.header" ID="RestructuredTextProvider.header"></a> +<h4>RestructuredTextProvider.header</h4> +<b>header</b>(<i>editor, level</i>) +<p> + Public method to generate a header. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd><dt><i>level</i> (int)</dt> +<dd> +header level +</dd> +</dl><a NAME="RestructuredTextProvider.headerLevels" ID="RestructuredTextProvider.headerLevels"></a> +<h4>RestructuredTextProvider.headerLevels</h4> +<b>headerLevels</b>(<i></i>) +<p> + Public method to determine the available header levels. +</p><dl> +<dt>Returns:</dt> +<dd> +supported header levels +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +int +</dd> +</dl><a NAME="RestructuredTextProvider.hyperlink" ID="RestructuredTextProvider.hyperlink"></a> +<h4>RestructuredTextProvider.hyperlink</h4> +<b>hyperlink</b>(<i>editor</i>) +<p> + Public method to generate hyperlink text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="RestructuredTextProvider.image" ID="RestructuredTextProvider.image"></a> +<h4>RestructuredTextProvider.image</h4> +<b>image</b>(<i>editor</i>) +<p> + Public method to generate image text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="RestructuredTextProvider.italic" ID="RestructuredTextProvider.italic"></a> +<h4>RestructuredTextProvider.italic</h4> +<b>italic</b>(<i>editor</i>) +<p> + Public method to generate italic text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="RestructuredTextProvider.kind" ID="RestructuredTextProvider.kind"></a> +<h4>RestructuredTextProvider.kind</h4> +<b>kind</b>(<i></i>) +<p> + Public method to get the markup kind. +</p><dl> +<dt>Returns:</dt> +<dd> +string with markup kind +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="RestructuredTextProvider.line" ID="RestructuredTextProvider.line"></a> +<h4>RestructuredTextProvider.line</h4> +<b>line</b>(<i>editor</i>) +<p> + Public method to generate a horizontal line text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="RestructuredTextProvider.numberedList" ID="RestructuredTextProvider.numberedList"></a> +<h4>RestructuredTextProvider.numberedList</h4> +<b>numberedList</b>(<i>editor</i>) +<p> + Public method to generate numbered list text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="RestructuredTextProvider.quote" ID="RestructuredTextProvider.quote"></a> +<h4>RestructuredTextProvider.quote</h4> +<b>quote</b>(<i>editor</i>) +<p> + Public method to generate block quote text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.QScintilla.MarkupProviders.__init__.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.QScintilla.MarkupProviders.__init__.html Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,65 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.QScintilla.MarkupProviders.__init__</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric6.QScintilla.MarkupProviders.__init__</h1> +<p> +Package providing various markup providers. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Functions</h3> +<table> +<tr> +<td><a href="#getMarkupProvider">getMarkupProvider</a></td> +<td>Public method to get a markup provider for the given editor.</td> +</tr> +</table> +<hr /><hr /> +<a NAME="getMarkupProvider" ID="getMarkupProvider"></a> +<h2>getMarkupProvider</h2> +<b>getMarkupProvider</b>(<i>editor</i>) +<p> + Public method to get a markup provider for the given editor. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to get the markup provider for +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +markup provider +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +MarkupBase +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.UI.Previewers.PreviewerHTML.html --- a/Documentation/Source/eric6.UI.Previewers.PreviewerHTML.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.UI.Previewers.PreviewerHTML.html Fri Feb 03 19:20:59 2017 +0100 @@ -62,7 +62,7 @@ QThread <h3>Class Attributes</h3> <table> -<tr><td>DefaultStaticPath</td></tr><tr><td>StaticRegexp</td></tr> +<tr><td>None</td></tr> </table> <h3>Class Methods</h3> <table> @@ -95,9 +95,6 @@ <td><a href="#PreviewProcessingThread.process">process</a></td> <td>Public method to convert the given text to HTML.</td> </tr><tr> -<td><a href="#PreviewProcessingThread.replace">replace</a></td> -<td></td> -</tr><tr> <td><a href="#PreviewProcessingThread.run">run</a></td> <td>Public thread method to convert the stored data.</td> </tr> @@ -264,10 +261,7 @@ flag indicating to use Sphinx to generate the ReST preview (boolean) </dd> -</dl><a NAME="PreviewProcessingThread.replace" ID="PreviewProcessingThread.replace"></a> -<h4>PreviewProcessingThread.replace</h4> -<b>replace</b>(<i></i>) -<a NAME="PreviewProcessingThread.run" ID="PreviewProcessingThread.run"></a> +</dl><a NAME="PreviewProcessingThread.run" ID="PreviewProcessingThread.run"></a> <h4>PreviewProcessingThread.run</h4> <b>run</b>(<i></i>) <p>
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.VCS.VersionControl.html --- a/Documentation/Source/eric6.VCS.VersionControl.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.VCS.VersionControl.html Fri Feb 03 19:20:59 2017 +0100 @@ -184,9 +184,6 @@ <td><a href="#VersionControl.vcsInitConfig">vcsInitConfig</a></td> <td>Public method to initialize the VCS configuration.</td> </tr><tr> -<td><a href="#VersionControl.vcsLog">vcsLog</a></td> -<td>Public method used to view the log of a file/directory in the vcs.</td> -</tr><tr> <td><a href="#VersionControl.vcsLogBrowser">vcsLogBrowser</a></td> <td>Public method used to view the log of a file/directory in the vcs with a log browser dialog.</td> </tr><tr> @@ -853,22 +850,6 @@ <dd> reference to the project (Project) </dd> -</dl><a NAME="VersionControl.vcsLog" ID="VersionControl.vcsLog"></a> -<h4>VersionControl.vcsLog</h4> -<b>vcsLog</b>(<i>name</i>) -<p> - Public method used to view the log of a file/directory in the vcs. -</p><dl> -<dt><i>name</i></dt> -<dd> -file/directory name to show the log for (string) -</dd> -</dl><dl> -<dt>Raises <b>RuntimeError</b>:</dt> -<dd> -to indicate that this method must be - implemented by a subclass -</dd> </dl><a NAME="VersionControl.vcsLogBrowser" ID="VersionControl.vcsLogBrowser"></a> <h4>VersionControl.vcsLogBrowser</h4> <b>vcsLogBrowser</b>(<i>name, isFile=False</i>)
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.html --- a/Documentation/Source/eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.html Fri Feb 03 19:20:59 2017 +0100 @@ -78,6 +78,9 @@ <td><a href="#QtHelpDocumentationDialog.on_documentsList_itemSelectionChanged">on_documentsList_itemSelectionChanged</a></td> <td>Private slot handling a change of the documents selection.</td> </tr><tr> +<td><a href="#QtHelpDocumentationDialog.on_managePluginButton_clicked">on_managePluginButton_clicked</a></td> +<td>Private slot to manage the QtHelp documents provided by plug-ins.</td> +</tr><tr> <td><a href="#QtHelpDocumentationDialog.on_removeButton_clicked">on_removeButton_clicked</a></td> <td>Private slot to remove a document from the help database.</td> </tr> @@ -145,6 +148,11 @@ <b>on_documentsList_itemSelectionChanged</b>(<i></i>) <p> Private slot handling a change of the documents selection. +</p><a NAME="QtHelpDocumentationDialog.on_managePluginButton_clicked" ID="QtHelpDocumentationDialog.on_managePluginButton_clicked"></a> +<h4>QtHelpDocumentationDialog.on_managePluginButton_clicked</h4> +<b>on_managePluginButton_clicked</b>(<i></i>) +<p> + Private slot to manage the QtHelp documents provided by plug-ins. </p><a NAME="QtHelpDocumentationDialog.on_removeButton_clicked" ID="QtHelpDocumentationDialog.on_removeButton_clicked"></a> <h4>QtHelpDocumentationDialog.on_removeButton_clicked</h4> <b>on_removeButton_clicked</b>(<i></i>)
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.html --- a/Documentation/Source/eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.html Fri Feb 03 19:20:59 2017 +0100 @@ -50,7 +50,7 @@ QDialog, Ui_QtHelpDocumentationSelectionDialog <h3>Class Attributes</h3> <table> -<tr><td>None</td></tr> +<tr><td>AddMode</td></tr><tr><td>ManageMode</td></tr> </table> <h3>Class Methods</h3> <table> @@ -62,8 +62,23 @@ <td><a href="#QtHelpDocumentationSelectionDialog.__init__">QtHelpDocumentationSelectionDialog</a></td> <td>Constructor</td> </tr><tr> +<td><a href="#QtHelpDocumentationSelectionDialog.__deleteCategory">__deleteCategory</a></td> +<td>Private method to delete a category.</td> +</tr><tr> <td><a href="#QtHelpDocumentationSelectionDialog.getData">getData</a></td> <td>Public method to retrieve the selected help documents.</td> +</tr><tr> +<td><a href="#QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked">on_deleteAllButton_clicked</a></td> +<td>Private slot to delete all documentation sets.</td> +</tr><tr> +<td><a href="#QtHelpDocumentationSelectionDialog.on_deleteButton_clicked">on_deleteButton_clicked</a></td> +<td>Private slot to delete the selected documentation sets.</td> +</tr><tr> +<td><a href="#QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked">on_deleteCategoryButton_clicked</a></td> +<td>Private slot to delete the selected documentation set categories.</td> +</tr><tr> +<td><a href="#QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged">on_documentationList_itemSelectionChanged</a></td> +<td>Private slot handling the selection of items.</td> </tr> </table> <h3>Static Methods</h3> @@ -72,7 +87,7 @@ </table> <a NAME="QtHelpDocumentationSelectionDialog.__init__" ID="QtHelpDocumentationSelectionDialog.__init__"></a> <h4>QtHelpDocumentationSelectionDialog (Constructor)</h4> -<b>QtHelpDocumentationSelectionDialog</b>(<i>helpDocuments, parent=None</i>) +<b>QtHelpDocumentationSelectionDialog</b>(<i>helpDocuments, mode, parent=None</i>) <p> Constructor </p><dl> @@ -80,10 +95,23 @@ <dd> dictionary containing the lists of help documents to be shown +</dd><dt><i>mode</i> (str)</dt> +<dd> +mode of the dialog </dd><dt><i>parent</i> (QWidget)</dt> <dd> reference to the parent widget </dd> +</dl><a NAME="QtHelpDocumentationSelectionDialog.__deleteCategory" ID="QtHelpDocumentationSelectionDialog.__deleteCategory"></a> +<h4>QtHelpDocumentationSelectionDialog.__deleteCategory</h4> +<b>__deleteCategory</b>(<i>category</i>) +<p> + Private method to delete a category. +</p><dl> +<dt><i>category</i> (QTreeWidgetItem)</dt> +<dd> +reference to the category item +</dd> </dl><a NAME="QtHelpDocumentationSelectionDialog.getData" ID="QtHelpDocumentationSelectionDialog.getData"></a> <h4>QtHelpDocumentationSelectionDialog.getData</h4> <b>getData</b>(<i></i>) @@ -99,7 +127,27 @@ <dd> list of str </dd> -</dl> +</dl><a NAME="QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked" ID="QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked"></a> +<h4>QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked</h4> +<b>on_deleteAllButton_clicked</b>(<i></i>) +<p> + Private slot to delete all documentation sets. +</p><a NAME="QtHelpDocumentationSelectionDialog.on_deleteButton_clicked" ID="QtHelpDocumentationSelectionDialog.on_deleteButton_clicked"></a> +<h4>QtHelpDocumentationSelectionDialog.on_deleteButton_clicked</h4> +<b>on_deleteButton_clicked</b>(<i></i>) +<p> + Private slot to delete the selected documentation sets. +</p><a NAME="QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked" ID="QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked"></a> +<h4>QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked</h4> +<b>on_deleteCategoryButton_clicked</b>(<i></i>) +<p> + Private slot to delete the selected documentation set categories. +</p><a NAME="QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged" ID="QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged"></a> +<h4>QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged</h4> +<b>on_documentationList_itemSelectionChanged</b>(<i></i>) +<p> + Private slot handling the selection of items. +</p> <div align="right"><a href="#top">Up</a></div> <hr /> </body></html> \ No newline at end of file
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/eric6.uninstall.html --- a/Documentation/Source/eric6.uninstall.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.uninstall.html Fri Feb 03 19:20:59 2017 +0100 @@ -25,7 +25,7 @@ </p> <h3>Global Attributes</h3> <table> -<tr><td>PythonMarkers</td></tr><tr><td>defaultMacAppBundleName</td></tr><tr><td>defaultMacAppBundlePath</td></tr><tr><td>includePythonVariant</td></tr><tr><td>progLanguages</td></tr><tr><td>progName</td></tr><tr><td>pyModDir</td></tr><tr><td>settingsNameGlobal</td></tr><tr><td>settingsNameOrganization</td></tr> +<tr><td>PythonMarkers</td></tr><tr><td>currDir</td></tr><tr><td>defaultMacAppBundleName</td></tr><tr><td>defaultMacAppBundlePath</td></tr><tr><td>includePythonVariant</td></tr><tr><td>progLanguages</td></tr><tr><td>progName</td></tr><tr><td>pyModDir</td></tr><tr><td>settingsNameGlobal</td></tr><tr><td>settingsNameOrganization</td></tr> </table> <h3>Classes</h3> <table>
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsMercurial.html --- a/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsMercurial.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsMercurial.html Fri Feb 03 19:20:59 2017 +0100 @@ -149,15 +149,9 @@ <td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html">HgLogBrowserDialog</a></td> <td>Module implementing a dialog to browse the log history.</td> </tr><tr> -<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html">HgLogDialog</a></td> -<td>Module implementing a dialog to show the output of the hg log command process.</td> -</tr><tr> <td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html">HgMergeDialog</a></td> <td>Module implementing a dialog to enter the data for a merge operation.</td> </tr><tr> -<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html">HgMultiRevisionSelectionDialog</a></td> -<td>Module implementing a dialog to select revisions.</td> -</tr><tr> <td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html">HgNewProjectOptionsDialog</a></td> <td>Module implementing the Mercurial Options Dialog for a new project from the repository.</td> </tr><tr>
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsPySvn.html --- a/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsPySvn.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsPySvn.html Fri Feb 03 19:20:59 2017 +0100 @@ -83,9 +83,6 @@ <td><a href="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html">SvnLogBrowserDialog</a></td> <td>Module implementing a dialog to browse the log history.</td> </tr><tr> -<td><a href="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html">SvnLogDialog</a></td> -<td>Module implementing a dialog to show the output of the svn log command process.</td> -</tr><tr> <td><a href="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.html">SvnLoginDialog</a></td> <td>Module implementing the login dialog for pysvn.</td> </tr><tr>
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsSubversion.html --- a/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsSubversion.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsSubversion.html Fri Feb 03 19:20:59 2017 +0100 @@ -74,9 +74,6 @@ <td><a href="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html">SvnLogBrowserDialog</a></td> <td>Module implementing a dialog to browse the log history.</td> </tr><tr> -<td><a href="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html">SvnLogDialog</a></td> -<td>Module implementing a dialog to show the output of the svn log command process.</td> -</tr><tr> <td><a href="eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html">SvnMergeDialog</a></td> <td>Module implementing a dialog to enter the data for a merge operation.</td> </tr><tr>
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/index-eric6.QScintilla.Lexers.html --- a/Documentation/Source/index-eric6.QScintilla.Lexers.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/index-eric6.QScintilla.Lexers.html Fri Feb 03 19:20:59 2017 +0100 @@ -73,6 +73,9 @@ <td><a href="eric6.QScintilla.Lexers.LexerIDL.html">LexerIDL</a></td> <td>Module implementing an IDL lexer with some additional methods.</td> </tr><tr> +<td><a href="eric6.QScintilla.Lexers.LexerJSON.html">LexerJSON</a></td> +<td>Module implementing a JSON lexer with some additional methods.</td> +</tr><tr> <td><a href="eric6.QScintilla.Lexers.LexerJava.html">LexerJava</a></td> <td>Module implementing a Java lexer with some additional methods.</td> </tr><tr> @@ -85,6 +88,9 @@ <td><a href="eric6.QScintilla.Lexers.LexerMakefile.html">LexerMakefile</a></td> <td>Module implementing a Makefile lexer with some additional methods.</td> </tr><tr> +<td><a href="eric6.QScintilla.Lexers.LexerMarkdown.html">LexerMarkdown</a></td> +<td>Module implementing a Markdown lexer with some additional methods.</td> +</tr><tr> <td><a href="eric6.QScintilla.Lexers.LexerMatlab.html">LexerMatlab</a></td> <td>Module implementing a Matlab lexer with some additional methods.</td> </tr><tr>
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/index-eric6.QScintilla.MarkupProviders.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/index-eric6.QScintilla.MarkupProviders.html Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,53 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.QScintilla.MarkupProviders</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body> +<h1>eric6.QScintilla.MarkupProviders</h1> +<p> +Package providing various markup providers. +</p> + + +<h3>Modules</h3> +<table> +<tr> +<td><a href="eric6.QScintilla.MarkupProviders.HtmlProvider.html">HtmlProvider</a></td> +<td>Module implementing the HTML markup provider.</td> +</tr><tr> +<td><a href="eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html">HyperlinkMarkupDialog</a></td> +<td>Module implementing a dialog to enter data to insert a hyperlink.</td> +</tr><tr> +<td><a href="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html">ImageMarkupDialog</a></td> +<td>Module implementing a dialog to enter data for an image markup.</td> +</tr><tr> +<td><a href="eric6.QScintilla.MarkupProviders.MarkdownProvider.html">MarkdownProvider</a></td> +<td>Module implementing the Markdown markup provider.</td> +</tr><tr> +<td><a href="eric6.QScintilla.MarkupProviders.MarkupBase.html">MarkupBase</a></td> +<td>Module implementing the base class for the markup providers.</td> +</tr><tr> +<td><a href="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html">RestructuredTextProvider</a></td> +<td>Module implementing the reStructured Text markup provider.</td> +</tr><tr> +<td><a href="eric6.QScintilla.MarkupProviders.__init__.html">MarkupProviders</a></td> +<td>Package providing various markup providers.</td> +</tr> +</table> +</body></html> \ No newline at end of file
diff -r 852016bbdedb -r c307358a2ecc Documentation/Source/index-eric6.QScintilla.html --- a/Documentation/Source/index-eric6.QScintilla.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/index-eric6.QScintilla.html Fri Feb 03 19:20:59 2017 +0100 @@ -42,6 +42,9 @@ <td><a href="index-eric6.QScintilla.Lexers.html">Lexers</a></td> <td>Package implementing lexers for the various supported programming languages.</td> </tr><tr> +<td><a href="index-eric6.QScintilla.MarkupProviders.html">MarkupProviders</a></td> +<td>Package providing various markup providers.</td> +</tr><tr> <td><a href="index-eric6.QScintilla.TypingCompleters.html">TypingCompleters</a></td> <td>Package implementing lexers for the various supported programming languages.</td> </tr> @@ -59,6 +62,9 @@ <td><a href="eric6.QScintilla.EditorAssembly.html">EditorAssembly</a></td> <td>Module implementing the editor assembly widget containing the navigation combos and the editor widget.</td> </tr><tr> +<td><a href="eric6.QScintilla.EditorButtonsWidget.html">EditorButtonsWidget</a></td> +<td>Module implementing a widget containing various buttons for accessing editor actions.</td> +</tr><tr> <td><a href="eric6.QScintilla.EditorMarkerMap.html">EditorMarkerMap</a></td> <td>Module implementing a class for showing an editor marker map.</td> </tr><tr>
diff -r 852016bbdedb -r c307358a2ecc Examples/rhallo.py --- a/Examples/rhallo.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Examples/rhallo.py Fri Feb 03 19:20:59 2017 +0100 @@ -10,7 +10,6 @@ if __name__ == "__main__": if eric6dbgstub.initDebugger("standard"): -# or if eric6dbgstub.initDebugger("threads"): eric6dbgstub.debugger.startDebugger() main()
diff -r 852016bbdedb -r c307358a2ecc Globals/__init__.py --- a/Globals/__init__.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Globals/__init__.py Fri Feb 03 19:20:59 2017 +0100 @@ -79,8 +79,8 @@ # check version of sip try: - import sipconfig - sipVersion = sipconfig.Configuration().sip_version_str + import sip + sipVersion = sip.SIP_VERSION_STR # always assume, that snapshots are good if "snapshot" not in sipVersion: # check for blacklisted versions @@ -91,7 +91,7 @@ .format(vers)) print('Please install another version.') return False - except ImportError: + except (ImportError, AttributeError): pass # check version of PyQt
diff -r 852016bbdedb -r c307358a2ecc Helpviewer/QtHelpDocumentationDialog.py --- a/Helpviewer/QtHelpDocumentationDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Helpviewer/QtHelpDocumentationDialog.py Fri Feb 03 19:20:59 2017 +0100 @@ -85,8 +85,10 @@ """ from .QtHelpDocumentationSelectionDialog import \ QtHelpDocumentationSelectionDialog - dlg = QtHelpDocumentationSelectionDialog(self.__pluginHelpDocuments, - self) + dlg = QtHelpDocumentationSelectionDialog( + self.__pluginHelpDocuments, + QtHelpDocumentationSelectionDialog.AddMode, + self) if dlg.exec_() == QDialog.Accepted: documents = dlg.getData() if not documents: @@ -94,6 +96,19 @@ self.__registerDocumentations(documents) + @pyqtSlot() + def on_managePluginButton_clicked(self): + """ + Private slot to manage the QtHelp documents provided by plug-ins. + """ + from .QtHelpDocumentationSelectionDialog import \ + QtHelpDocumentationSelectionDialog + dlg = QtHelpDocumentationSelectionDialog( + self.__pluginHelpDocuments, + QtHelpDocumentationSelectionDialog.ManageMode, + self) + dlg.exec_() + def __registerDocumentations(self, fileNames): """ Private method to register a given list of documentations.
diff -r 852016bbdedb -r c307358a2ecc Helpviewer/QtHelpDocumentationDialog.ui --- a/Helpviewer/QtHelpDocumentationDialog.ui Fri Jan 27 19:18:52 2017 +0100 +++ b/Helpviewer/QtHelpDocumentationDialog.ui Fri Feb 03 19:20:59 2017 +0100 @@ -26,20 +26,7 @@ </item> <item> <layout class="QGridLayout" name="gridLayout"> - <item row="3" column="1"> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>98</height> - </size> - </property> - </spacer> - </item> - <item row="0" column="0" rowspan="4"> + <item row="0" column="0" rowspan="6"> <widget class="QListWidget" name="documentsList"> <property name="alternatingRowColors"> <bool>true</bool> @@ -62,6 +49,16 @@ </property> </widget> </item> + <item row="1" column="1"> + <widget class="QPushButton" name="addPluginButton"> + <property name="toolTip"> + <string>Press to select QtHelp documents provided by a plug-in to add to the database</string> + </property> + <property name="text"> + <string>Add from Plug-ins...</string> + </property> + </widget> + </item> <item row="2" column="1"> <widget class="QPushButton" name="removeButton"> <property name="toolTip"> @@ -72,16 +69,39 @@ </property> </widget> </item> - <item row="1" column="1"> - <widget class="QPushButton" name="addPluginButton"> + <item row="3" column="1"> + <widget class="Line" name="line"> + <property name="lineWidth"> + <number>2</number> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item row="4" column="1"> + <widget class="QPushButton" name="managePluginButton"> <property name="toolTip"> - <string>Press to select QtHelp documents provided by a plug-in to add to the database</string> + <string>Select to manage the plug-in provided documentation sets</string> </property> <property name="text"> - <string>Add from Plug-ins...</string> + <string>Manage Plug-ins...</string> </property> </widget> </item> + <item row="5" column="1"> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>18</height> + </size> + </property> + </spacer> + </item> </layout> </item> <item>
diff -r 852016bbdedb -r c307358a2ecc Helpviewer/QtHelpDocumentationSelectionDialog.py --- a/Helpviewer/QtHelpDocumentationSelectionDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Helpviewer/QtHelpDocumentationSelectionDialog.py Fri Feb 03 19:20:59 2017 +0100 @@ -9,11 +9,18 @@ """ from __future__ import unicode_literals +try: + str = unicode +except NameError: + pass import os +import shutil -from PyQt5.QtCore import Qt -from PyQt5.QtWidgets import QDialog, QTreeWidgetItem +from PyQt5.QtCore import pyqtSlot, Qt +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem + +from E5Gui import E5MessageBox from .Ui_QtHelpDocumentationSelectionDialog import \ Ui_QtHelpDocumentationSelectionDialog @@ -25,27 +32,139 @@ Class implementing a dialog to select QtHelp documentation sets to be installed. """ - def __init__(self, helpDocuments, parent=None): + AddMode = "Add" + ManageMode = "Manage" + + def __init__(self, helpDocuments, mode, parent=None): """ Constructor @param helpDocuments dictionary containing the lists of help documents to be shown @type dict of lists of str + @param mode mode of the dialog + @type str @param parent reference to the parent widget @type QWidget """ super(QtHelpDocumentationSelectionDialog, self).__init__(parent) self.setupUi(self) + if mode == QtHelpDocumentationSelectionDialog.AddMode: + self.buttonBox.button(QDialogButtonBox.Close).hide() + else: + self.buttonBox.button(QDialogButtonBox.Ok).hide() + self.buttonBox.button(QDialogButtonBox.Cancel).hide() + for category in helpDocuments: parentItem = QTreeWidgetItem(self.documentationList, [category]) for document in helpDocuments[category]: item = QTreeWidgetItem(parentItem, [os.path.basename(document)]) item.setData(0, Qt.UserRole, document) + parentItem.setData(0, Qt.UserRole, os.path.dirname(document)) self.documentationList.sortItems(0, Qt.AscendingOrder) + @pyqtSlot() + def on_documentationList_itemSelectionChanged(self): + """ + Private slot handling the selection of items. + """ + selectedCategoriesCount = 0 + selectedDocumentSetCount = 0 + for itm in self.documentationList.selectedItems(): + if itm.parent() is None: + selectedCategoriesCount += 1 + else: + selectedDocumentSetCount += 1 + + self.deleteButton.setEnabled(selectedDocumentSetCount > 0) + self.deleteCategoryButton.setEnabled(selectedCategoriesCount > 0) + + @pyqtSlot() + def on_deleteButton_clicked(self): + """ + Private slot to delete the selected documentation sets. + """ + yes = E5MessageBox.yesNo( + self, + self.tr("Delete Documentation Sets"), + self.tr("""Shall the selected documentation sets really be""" + """ deleted?""")) + if yes: + for itm in self.documentationList.selectedItems(): + if itm.parent is None: + # it is a category item, skip it + continue + + category = itm.parent() + fileName = itm.data(0, Qt.UserRole) + try: + os.remove(fileName) + except OSError as err: + E5MessageBox.warning( + self, + self.tr("Delete Documentation Sets"), + self.tr("""<p>The documentation set <b>{0}</b> could""" + """ not be deleted.</p><p>Reason: {1}</p>""") + .format(fileName, str(err))) + continue + + category.removeChild(itm) + del itm + + if category.childCount() == 0: + self.__deleteCategory(category) + + @pyqtSlot() + def on_deleteCategoryButton_clicked(self): + """ + Private slot to delete the selected documentation set categories. + """ + yes = E5MessageBox.yesNo( + self, + self.tr("Delete Documentation Sets"), + self.tr("""Shall the selected documentation set categories""" + """ really be deleted?""")) + if yes: + categories = [] + for itm in self.documentationList.selectedItems(): + if itm.parent() is None: + categories.append(itm) + for category in categories: + self.__deleteCategory(category) + + @pyqtSlot() + def on_deleteAllButton_clicked(self): + """ + Private slot to delete all documentation sets. + """ + yes = E5MessageBox.yesNo( + self, + self.tr("Delete Documentation Sets"), + self.tr("""Shall all documentation sets really be deleted?""")) + if yes: + categories = [] + for index in range(self.documentationList.topLevelItemCount()): + categories.append( + self.documentationList.topLevelItem(index)) + for category in categories: + self.__deleteCategory(category) + + def __deleteCategory(self, category): + """ + Private method to delete a category. + + @param category reference to the category item + @type QTreeWidgetItem + """ + categoryDir = category.data(0, Qt.UserRole) + shutil.rmtree(categoryDir, True) + + self.documentationList.takeTopLevelItem( + self.documentationList.indexOfTopLevelItem(category)) + del category + def getData(self): """ Public method to retrieve the selected help documents.
diff -r 852016bbdedb -r c307358a2ecc Helpviewer/QtHelpDocumentationSelectionDialog.ui --- a/Helpviewer/QtHelpDocumentationSelectionDialog.ui Fri Jan 27 19:18:52 2017 +0100 +++ b/Helpviewer/QtHelpDocumentationSelectionDialog.ui Fri Feb 03 19:20:59 2017 +0100 @@ -49,17 +49,70 @@ </widget> </item> <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QPushButton" name="deleteButton"> + <property name="toolTip"> + <string>Press to delete the selected documentation sets</string> + </property> + <property name="text"> + <string>Delete</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="deleteCategoryButton"> + <property name="toolTip"> + <string>Press to delete the selected category</string> + </property> + <property name="text"> + <string>Delete Categories</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="deleteAllButton"> + <property name="toolTip"> + <string>Press to delete all entries</string> + </property> + <property name="text"> + <string>Delete All</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close|QDialogButtonBox::Ok</set> </property> </widget> </item> </layout> </widget> + <tabstops> + <tabstop>documentationList</tabstop> + <tabstop>deleteButton</tabstop> + <tabstop>deleteCategoryButton</tabstop> + <tabstop>deleteAllButton</tabstop> + </tabstops> <resources/> <connections> <connection>
diff -r 852016bbdedb -r c307358a2ecc IconEditor/IconEditorWindow.py --- a/IconEditor/IconEditorWindow.py Fri Jan 27 19:18:52 2017 +0100 +++ b/IconEditor/IconEditorWindow.py Fri Feb 03 19:20:59 2017 +0100 @@ -123,8 +123,12 @@ """ filters = { 'bmp': self.tr("Windows Bitmap File (*.bmp)"), + 'cur': self.tr("Windows Cursor File (*.cur)"), + 'dds': self.tr("DirectDraw-Surface File (*.dds)"), 'gif': self.tr("Graphic Interchange Format File (*.gif)"), + 'icns': self.tr("Apple Icon File (*.icns)"), 'ico': self.tr("Windows Icon File (*.ico)"), + 'jp2': self.tr("JPEG2000 File (*.jp2)"), 'jpg': self.tr("JPEG File (*.jpg)"), 'jpeg': self.tr("JPEG File (*.jpeg)"), 'mng': self.tr("Multiple-Image Network Graphics File (*.mng)"), @@ -141,6 +145,7 @@ 'tif': self.tr("TIFF File (*.tif)"), 'tiff': self.tr("TIFF File (*.tiff)"), 'wbmp': self.tr("WAP Bitmap File (*.wbmp)"), + 'webp': self.tr("WebP Image File (*.webp)"), 'xbm': self.tr("X11 Bitmap File (*.xbm)"), 'xpm': self.tr("X11 Pixmap File (*.xpm)"), }
diff -r 852016bbdedb -r c307358a2ecc PluginManager/PluginManager.py --- a/PluginManager/PluginManager.py Fri Jan 27 19:18:52 2017 +0100 +++ b/PluginManager/PluginManager.py Fri Feb 03 19:20:59 2017 +0100 @@ -1257,7 +1257,7 @@ if version.count(".") >= 3: # cope for extended version numbers by ignoring # the extension - checkVersion = ".".join(version.split(".",3)[:3]) + checkVersion = ".".join(version.split(".", 3)[:3]) else: checkVersion = version if pluginDetails["version"] < checkVersion:
diff -r 852016bbdedb -r c307358a2ecc PluginManager/PluginRepositoryDialog.py --- a/PluginManager/PluginRepositoryDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ b/PluginManager/PluginRepositoryDialog.py Fri Feb 03 19:20:59 2017 +0100 @@ -648,7 +648,7 @@ if version.count(".") >= 3: # cope for extended version numbers by ignoring # the extension - version = ".".join(version.split(".",3)[:3]) + version = ".".join(version.split(".", 3)[:3]) if pluginDetails["version"] < version: return PluginRepositoryWidget.PluginStatusLocalUpdate
diff -r 852016bbdedb -r c307358a2ecc Plugins/CheckerPlugins/CodeStyleChecker/pycodestyle.py --- a/Plugins/CheckerPlugins/CodeStyleChecker/pycodestyle.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/pycodestyle.py Fri Feb 03 19:20:59 2017 +0100 @@ -79,7 +79,7 @@ except ImportError: from ConfigParser import RawConfigParser # __IGNORE_WARNING__ -__version__ = '2.1.0-eric' +__version__ = '2.2.0-eric' DEFAULT_EXCLUDE = '.svn,CVS,.bzr,.hg,.git,__pycache__,.tox' DEFAULT_IGNORE = 'E121,E123,E126,E226,E24,E704,W503' @@ -926,8 +926,11 @@ Okay: # this is a comment\nimport os Okay: '''this is a module docstring'''\nimport os Okay: r'''this is a module docstring'''\nimport os - Okay: try:\n import x\nexcept:\n pass\nelse:\n pass\nimport y - Okay: try:\n import x\nexcept:\n pass\nfinally:\n pass\nimport y + Okay: + try:\n\timport x\nexcept ImportError:\n\tpass\nelse:\n\tpass\nimport y + Okay: + try:\n\timport x\nexcept ImportError:\n\tpass\nfinally:\n\tpass\nimport y + E402: a=1\nimport os E402: 'One string'\n"Two string"\nimport os E402: a=1\nfrom sys import x @@ -1196,6 +1199,22 @@ yield match.start(), "E721 do not compare types, use 'isinstance()'" +def bare_except(logical_line, noqa): + r"""When catching exceptions, mention specific exceptions whenever possible. + + Okay: except Exception: + Okay: except BaseException: + E722: except: + """ + if noqa: + return + + regex = re.compile(r"except\s*:") + match = regex.match(logical_line) + if match: + yield match.start(), "E722 do not use bare except'" + + def ambiguous_identifier(logical_line, tokens): r"""Never use the characters 'l', 'O', or 'I' as variable names.
diff -r 852016bbdedb -r c307358a2ecc Plugins/CheckerPlugins/CodeStyleChecker/translations.py --- a/Plugins/CheckerPlugins/CodeStyleChecker/translations.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/translations.py Fri Feb 03 19:20:59 2017 +0100 @@ -237,6 +237,9 @@ "E721": QCoreApplication.translate( "pycodestyle", "do not compare types, use 'isinstance()'"), + "E722": QCoreApplication.translate( + "pycodestyle", + "do not use bare except"), "E731": QCoreApplication.translate( "pycodestyle", "do not assign a lambda expression, use a def"),
diff -r 852016bbdedb -r c307358a2ecc Plugins/PluginVcsMercurial.py --- a/Plugins/PluginVcsMercurial.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/PluginVcsMercurial.py Fri Feb 03 19:20:59 2017 +0100 @@ -160,7 +160,6 @@ self.__mercurialDefaults = { "StopLogOnCopy": True, # used in log browser - "UseLogBrowser": True, "LogLimit": 20, "CommitMessages": 20, "Commits": [], @@ -176,6 +175,7 @@ "Encoding": "utf-8", "EncodingMode": "strict", "ConsiderHidden": False, + "LogMessageColumnWidth": 30, } from VcsPlugins.vcsMercurial.ProjectHelper import HgProjectHelper @@ -247,13 +247,12 @@ @param key the key of the value to get @return the requested setting """ - if key in ["StopLogOnCopy", "UseLogBrowser", "PullUpdate", - "PreferUnbundle", "CreateBackup", "InternalMerge", - "ConsiderHidden"]: + if key in ["StopLogOnCopy", "PullUpdate", "PreferUnbundle", + "CreateBackup", "InternalMerge", "ConsiderHidden"]: return Preferences.toBool(Preferences.Prefs.settings.value( "Mercurial/" + key, self.__mercurialDefaults[key])) elif key in ["LogLimit", "CommitMessages", "CommitAuthorsLimit", - "ServerPort"]: + "ServerPort", "LogMessageColumnWidth"]: return int(Preferences.Prefs.settings.value( "Mercurial/" + key, self.__mercurialDefaults[key])) elif key in ["Commits", "CommitAuthors"]:
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py --- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Fri Feb 03 19:20:59 2017 +0100 @@ -50,14 +50,13 @@ # log self.logSpinBox.setValue( self.__plugin.getPreferences("LogLimit")) + self.logWidthSpinBox.setValue( + self.__plugin.getPreferences("LogMessageColumnWidth")) # commit self.commitSpinBox.setValue( self.__plugin.getPreferences("CommitMessages")) self.commitAuthorsSpinBox.setValue( self.__plugin.getPreferences("CommitAuthorsLimit")) - # incoming/outgoing - self.logBrowserCheckBox.setChecked( - self.__plugin.getPreferences("UseLogBrowser")) # pull self.pullUpdateCheckBox.setChecked( self.__plugin.getPreferences("PullUpdate")) @@ -87,14 +86,13 @@ # log self.__plugin.setPreferences( "LogLimit", self.logSpinBox.value()) + self.__plugin.setPreferences( + "LogMessageColumnWidth", self.logWidthSpinBox.value()) # commit self.__plugin.setPreferences( "CommitMessages", self.commitSpinBox.value()) self.__plugin.setPreferences( "CommitAuthorsLimit", self.commitAuthorsSpinBox.value()) - # incoming/outgoing - self.__plugin.setPreferences( - "UseLogBrowser", self.logBrowserCheckBox.isChecked()) # pull self.__plugin.setPreferences( "PullUpdate", self.pullUpdateCheckBox.isChecked())
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui --- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui Fri Feb 03 19:20:59 2017 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>609</width> - <height>751</height> + <height>911</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_5"> @@ -92,15 +92,15 @@ <property name="title"> <string>Log</string> </property> - <layout class="QHBoxLayout"> - <item> + <layout class="QGridLayout" name="gridLayout_3"> + <item row="0" column="0"> <widget class="QLabel" name="label"> <property name="text"> <string>No. of log messages shown:</string> </property> </widget> </item> - <item> + <item row="0" column="1"> <widget class="QSpinBox" name="logSpinBox"> <property name="toolTip"> <string>Enter the number of log messages to be shown</string> @@ -113,7 +113,7 @@ </property> </widget> </item> - <item> + <item row="0" column="2"> <spacer> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -126,6 +126,26 @@ </property> </spacer> </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_7"> + <property name="text"> + <string>No. of message characters shown in list:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QSpinBox" name="logWidthSpinBox"> + <property name="toolTip"> + <string>Enter the number of characters of the commit message to be shown in the list</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="minimum"> + <number>10</number> + </property> + </widget> + </item> </layout> </widget> </item> @@ -211,25 +231,6 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_3"> - <property name="title"> - <string>Incoming / Outgoing</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QCheckBox" name="logBrowserCheckBox"> - <property name="toolTip"> - <string>Select to show the incoming and outgoing log in a log browser dialog</string> - </property> - <property name="text"> - <string>Use Log Browser for incoming / outgoing log</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> <widget class="QGroupBox" name="groupBox_4"> <property name="title"> <string>Pull</string> @@ -357,9 +358,9 @@ <tabstop>encodingModeComboBox</tabstop> <tabstop>hiddenChangesetsCheckBox</tabstop> <tabstop>logSpinBox</tabstop> + <tabstop>logWidthSpinBox</tabstop> <tabstop>commitSpinBox</tabstop> <tabstop>commitAuthorsSpinBox</tabstop> - <tabstop>logBrowserCheckBox</tabstop> <tabstop>pullUpdateCheckBox</tabstop> <tabstop>preferUnbundleCheckBox</tabstop> <tabstop>internalMergeCheckBox</tabstop>
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py --- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Fri Feb 03 19:20:59 2017 +0100 @@ -15,9 +15,10 @@ import os import re +import collections from PyQt5.QtCore import pyqtSlot, Qt, QDate, QProcess, QTimer, QRegExp, \ - QSize, QPoint + QSize, QPoint, QUrl from PyQt5.QtGui import QCursor, QColor, QPixmap, QPainter, QPen, QBrush, QIcon from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QHeaderView, \ QTreeWidgetItem, QApplication, QLineEdit, QMenu, QInputDialog @@ -81,6 +82,9 @@ self.filesTree.headerItem().setText(self.filesTree.columnCount(), "") self.filesTree.header().setSortIndicator(0, Qt.AscendingOrder) + self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) + self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png")) + self.refreshButton = self.buttonBox.addButton( self.tr("&Refresh"), QDialogButtonBox.ActionRole) self.refreshButton.setToolTip( @@ -115,12 +119,16 @@ "<tr><td><b>Author</b></td><td>{2}</td></tr>" "<tr><td><b>Branch</b></td><td>{3}</td></tr>" "<tr><td><b>Parents</b></td><td>{4}</td></tr>" - "{5}" + "<tr><td><b>Children</b></td><td>{5}</td></tr>" + "{6}" "</table>" ) self.__tagsTemplate = self.tr( "<tr><td><b>Tags</b></td><td>{0}</td></tr>" ) + self.__latestTagTemplate = self.tr( + "<tr><td><b>Latest Tag</b></td><td>{0}</td></tr>" + ) self.__bookmarksTemplate = self.tr( "<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>" ) @@ -143,6 +151,7 @@ self.__changesRole = Qt.UserRole + 1 self.__edgesRole = Qt.UserRole + 2 self.__parentsRole = Qt.UserRole + 3 + self.__latestTagRole = Qt.UserRole + 4 if self.__hgClient: self.process = None @@ -173,7 +182,29 @@ self.logTree.headerItem().setText( self.BookmarksColumn, self.tr("Bookmarks")) + self.__logTreeNormalFont = self.logTree.font() + self.__logTreeNormalFont.setBold(False) + self.__logTreeBoldFont = self.logTree.font() + self.__logTreeBoldFont.setBold(True) + + self.detailsEdit.anchorClicked.connect(self.__revisionClicked) + self.__initActionsMenu() + + self.__finishCallbacks = [] + + def __addFinishCallback(self, callback): + """ + Private method to add a method to be called once the process finished. + + The callback methods are invoke in a FIFO style and are consumed. If + a callback method needs to be called again, it must be added again. + + @param callback callback method + @type function + """ + if callback not in self.__finishCallbacks: + self.__finishCallbacks.append(callback) def __initActionsMenu(self): """ @@ -284,6 +315,8 @@ self.__projectRevision = -1 self.__projectBranch = "" + + self.__childrenInfo = collections.defaultdict(list) def closeEvent(self, e): """ @@ -671,8 +704,58 @@ self.__closedBranchesRevs.append( parts[-2].split(":", 1)[0]) + def __getRevisionOfTag(self, tag): + """ + Private method to get the revision of a tag. + + @param tag tag name + @type str + @return tuple containing the revision and changeset ID + @rtype tuple of (str, str) + """ + errMsg = "" + + args = self.vcs.initCommand("tags") + + output = "" + if self.__hgClient: + output, errMsg = self.__hgClient.runcommand(args) + else: + process = QProcess() + process.setWorkingDirectory(self.repodir) + process.start('hg', args) + procStarted = process.waitForStarted(5000) + if procStarted: + finished = process.waitForFinished(30000) + if finished and process.exitCode() == 0: + output = str(process.readAllStandardOutput(), + self.vcs.getEncoding(), 'replace') + else: + if not finished: + errMsg = self.tr( + "The hg process did not finish within 30s.") + else: + errMsg = self.tr("Could not start the hg executable.") + + if errMsg: + E5MessageBox.critical( + self, + self.tr("Mercurial Error"), + errMsg) + + res = ("", "") + if output: + for line in output.splitlines(): + name, rev = line.strip().rsplit(None, 1) + if name == tag: + res = tuple(rev.split(":", 1)) + break + + return res + def __generateLogItem(self, author, date, message, revision, changedPaths, - parents, branches, tags, phase, bookmarks=None): + parents, branches, tags, phase, bookmarks, + latestTag): """ Private method to generate a log tree entry. @@ -687,20 +770,27 @@ @param tags list of tags (string) @param phase phase of the entry (string) @param bookmarks list of bookmarks (string) + @param latestTag the latest tag(s) reachable from the changeset + (list of strings) @return reference to the generated item (QTreeWidgetItem) """ - msg = [] + logMessageColumnWidth = self.vcs.getPlugin().getPreferences( + "LogMessageColumnWidth") + msgtxt = "" for line in message: - msg.append(line.strip()) + if ". " in line: + msgtxt += " " + line.strip().split(". ", 1)[0] + "." + break + else: + msgtxt += " " + line.strip() + if len(msgtxt) > logMessageColumnWidth: + msgtxt = "{0}...".format(msgtxt[:logMessageColumnWidth]) rev, node = revision.split(":") if rev in self.__closedBranchesRevs: closedStr = self.ClosedIndicator else: closedStr = "" - msgtxt = msg[0] - if len(msgtxt) > 30: - msgtxt = "{0}...".format(msgtxt[:30]) if phase in self.phases: phaseStr = self.phases[phase] else: @@ -731,10 +821,13 @@ itm.setData(0, self.__messageRole, message) itm.setData(0, self.__changesRole, changedPaths) itm.setData(0, self.__edgesRole, edges) + itm.setData(0, self.__latestTagRole, latestTag) if parents == [-1]: itm.setData(0, self.__parentsRole, []) else: itm.setData(0, self.__parentsRole, parents) + for parent in parents: + self.__childrenInfo[parent].append(int(rev)) if self.logTree.topLevelItemCount() > 1: topedges = \ @@ -774,11 +867,12 @@ return itm - def __getLogEntries(self, startRev=None): + def __getLogEntries(self, startRev=None, noEntries=0): """ Private method to retrieve log entries from the repository. @param startRev revision number to start from (integer, string) + @keyparam noEntries number of entries to get (0 = default) (int) """ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) @@ -793,12 +887,15 @@ self.errors.clear() self.intercept = False + if noEntries == 0: + noEntries = self.limitSpinBox.value() + preargs = [] args = self.vcs.initCommand(self.commandMode) args.append('--verbose') if self.commandMode not in ("incoming", "outgoing"): args.append('--limit') - args.append(str(self.limitSpinBox.value())) + args.append(str(noEntries)) if self.commandMode in ("incoming", "outgoing"): args.append("--newest-first") if self.vcs.hasSubrepositories(): @@ -858,9 +955,6 @@ self.process.setWorkingDirectory(self.repodir) - self.inputGroup.setEnabled(True) - self.inputGroup.show() - if preargs: process = QProcess() process.setWorkingDirectory(self.repodir) @@ -888,7 +982,7 @@ else: self.__finish() - def start(self, fn, bundle=None, isFile=False): + def start(self, fn, bundle=None, isFile=False, noEntries=0): """ Public slot to start the hg log command. @@ -896,6 +990,7 @@ @keyparam bundle name of a bundle file (string) @keyparam isFile flag indicating log for a file is to be shown (boolean) + @keyparam noEntries number of entries to get (0 = default) (int) """ self.__bundle = bundle self.__isFile = isFile @@ -927,7 +1022,7 @@ self.__started = True self.__identifyProject() self.__getClosedBranches() - self.__getLogEntries() + self.__getLogEntries(noEntries=noEntries) def __procFinished(self, exitCode, exitStatus): """ @@ -959,6 +1054,9 @@ self.inputGroup.setEnabled(False) self.inputGroup.hide() self.refreshButton.setEnabled(True) + + while self.__finishCallbacks: + self.__finishCallbacks.pop(0)() def __modifyForLargeFiles(self, filename): """ @@ -1050,6 +1148,15 @@ log["bookmarks"] = value.strip().split(", ") elif key == "phase": log["phase"] = value.strip() + elif key == "latesttag": + tag = value.strip() + if tag == "null": + log["latesttag"] = [] + elif ":" in tag: + log["latesttag"] = [ + t.strip() for t in tag.split(":") if t.strip()] + else: + log["latesttag"] = [tag] else: if initialText: continue @@ -1061,7 +1168,7 @@ log["author"], log["date"], log["message"], log["revision"], changedPaths, log["parents"], log["branches"], log["tags"], - log["phase"], log["bookmarks"]) + log["phase"], log["bookmarks"], log["latesttag"]) dt = QDate.fromString(log["date"], Qt.ISODate) if not self.__maxDate.isValid() and \ not self.__minDate.isValid(): @@ -1159,6 +1266,11 @@ self.errorGroup.show() self.errors.insertPlainText(out) self.errors.ensureCursorVisible() + + if not self.__hgClient: + # show input in case the process asked for some input + self.inputGroup.setEnabled(True) + self.inputGroup.show() def __diffRevisions(self, rev1, rev2): """ @@ -1320,16 +1432,47 @@ itm.text(self.BookmarksColumn)) else: bookmarksStr = "" + + if itm.data(0, self.__latestTagRole): + latestTagLinks = [] + for tag in itm.data(0, self.__latestTagRole): + url = QUrl() + url.setScheme("rev") + url.setPath(self.__getRevisionOfTag(tag)[0]) + latestTagLinks.append('<a href="{0}">{1}</a>'.format( + url.toString(), tag)) + latestTagStr = self.__latestTagTemplate.format( + ", ".join(latestTagLinks)) + else: + latestTagStr = "" + + rev = int(itm.text(self.RevisionColumn).split(":", 1)[0]) + + parentLinks = [] + for parent in [str(x) for x in itm.data(0, self.__parentsRole)]: + url = QUrl() + url.setScheme("rev") + url.setPath(parent) + parentLinks.append('<a href="{0}">{1}</a>'.format( + url.toString(), parent)) + + childLinks = [] + for child in [str(x) for x in self.__childrenInfo[rev]]: + url = QUrl() + url.setScheme("rev") + url.setPath(child) + childLinks.append('<a href="{0}">{1}</a>'.format( + url.toString(), child)) + self.detailsEdit.setHtml(self.__detailsTemplate.format( itm.text(self.RevisionColumn), itm.text(self.DateColumn), itm.text(self.AuthorColumn), itm.text(self.BranchColumn).replace( self.ClosedIndicator, ""), - ", ".join( - [str(x) for x in itm.data(0, self.__parentsRole)] - ), - tagsStr + bookmarksStr, + ", ".join(parentLinks), + ", ".join(childLinks), + tagsStr + latestTagStr + bookmarksStr, )) for line in itm.data(0, self.__messageRole): @@ -1354,25 +1497,57 @@ self.__updateGui(current) self.__updateDiffButtons() self.__updateToolMenuActions() + + # Highlight the current entry using a bold font + for col in range(self.logTree.columnCount()): + current and current.setFont(col, self.__logTreeBoldFont) + previous and previous.setFont(col, self.__logTreeNormalFont) + + # set the state of the up and down buttons + self.upButton.setEnabled( + current is not None and + self.logTree.indexOfTopLevelItem(current) > 0) + self.downButton.setEnabled( + current is not None and + int(current.text(self.RevisionColumn).split(":")[0]) > 0) @pyqtSlot() def on_logTree_itemSelectionChanged(self): """ Private slot called, when the selection has changed. """ - if len(self.logTree.selectedItems()) == 1: - self.__updateGui(self.logTree.selectedItems()[0]) - self.__updateDiffButtons() self.__updateToolMenuActions() @pyqtSlot() + def on_upButton_clicked(self): + """ + Private slot to move the current item up one entry. + """ + itm = self.logTree.itemAbove(self.logTree.currentItem()) + if itm: + self.logTree.setCurrentItem(itm) + + @pyqtSlot() + def on_downButton_clicked(self): + """ + Private slot to move the current item down one entry. + """ + itm = self.logTree.itemBelow(self.logTree.currentItem()) + if itm: + self.logTree.setCurrentItem(itm) + else: + # load the next bunch and try again + self.__addFinishCallback(self.on_downButton_clicked) + self.on_nextButton_clicked() + + @pyqtSlot() def on_nextButton_clicked(self): """ Private slot to handle the Next button. """ if self.__lastRev > 0: - self.__getLogEntries(self.__lastRev - 1) + self.__getLogEntries(startRev=self.__lastRev - 1) @pyqtSlot() def on_diffP1Button_clicked(self): @@ -1586,8 +1761,6 @@ self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) - self.inputGroup.setEnabled(True) - self.inputGroup.show() self.refreshButton.setEnabled(False) # save the current items commit ID @@ -1605,7 +1778,8 @@ self.limitSpinBox.setEnabled(True) self.commandMode = self.initialCommandMode - self.start(self.__filename, isFile=self.__isFile) + self.start(self.__filename, isFile=self.__isFile, + noEntries=self.logTree.topLevelItemCount()) def on_passwordCheckBox_toggled(self, isOn): """ @@ -1632,7 +1806,6 @@ else: self.errors.insertPlainText(input) self.errors.ensureCursorVisible() - self.errorGroup.show() self.process.write(input) @@ -1998,3 +2171,28 @@ self, self.tr("Find Commit"), self.tr("""'{0}' was not found.""").format(self.rxEdit.text())) + + def __revisionClicked(self, url): + """ + Private slot to handle the anchorClicked signal of the changeset + details pane. + + @param url URL that was clicked + @type QUrl + """ + if url.scheme() == "rev": + # a parent or child revision was clicked, show the respective item + rev = url.path() + searchStr = "{0:>7}:".format(rev) + # format must be in sync with item generation format + items = self.logTree.findItems(searchStr, Qt.MatchStartsWith, + self.RevisionColumn) + if items: + itm = items[0] + if itm.isHidden(): + itm.setHidden(False) + self.logTree.setCurrentItem(itm) + else: + # load the next batch and try again + self.on_nextButton_clicked() + self.__revisionClicked(url)
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui --- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui Fri Feb 03 19:20:59 2017 +0100 @@ -209,84 +209,96 @@ </widget> </item> <item> - <widget class="QSplitter" name="commitSplitter"> + <widget class="QSplitter" name="splitter"> <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> <horstretch>0</horstretch> - <verstretch>3</verstretch> + <verstretch>8</verstretch> </sizepolicy> </property> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Vertical</enum> </property> - <property name="childrenCollapsible"> - <bool>false</bool> - </property> - <widget class="QTextEdit" name="detailsEdit"> + <widget class="QSplitter" name="commitSplitter"> <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>1</horstretch> - <verstretch>3</verstretch> - </sizepolicy> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - </widget> - <widget class="QTextEdit" name="messageEdit"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>2</horstretch> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> <verstretch>3</verstretch> </sizepolicy> </property> - <property name="readOnly"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="childrenCollapsible"> + <bool>false</bool> + </property> + <widget class="QTextBrowser" name="detailsEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>1</horstretch> + <verstretch>3</verstretch> + </sizepolicy> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="openLinks"> + <bool>false</bool> + </property> + </widget> + <widget class="QTextEdit" name="messageEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>2</horstretch> + <verstretch>3</verstretch> + </sizepolicy> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </widget> + <widget class="QTreeWidget" name="filesTree"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>4</verstretch> + </sizepolicy> + </property> + <property name="alternatingRowColors"> <bool>true</bool> </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <property name="sortingEnabled"> + <bool>true</bool> + </property> + <property name="allColumnsShowFocus"> + <bool>true</bool> + </property> + <column> + <property name="text"> + <string>Action</string> + </property> + </column> + <column> + <property name="text"> + <string>Path</string> + </property> + </column> + <column> + <property name="text"> + <string>Copy from</string> + </property> + </column> </widget> </widget> </item> <item> - <widget class="QTreeWidget" name="filesTree"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>4</verstretch> - </sizepolicy> - </property> - <property name="alternatingRowColors"> - <bool>true</bool> - </property> - <property name="rootIsDecorated"> - <bool>false</bool> - </property> - <property name="itemsExpandable"> - <bool>false</bool> - </property> - <property name="sortingEnabled"> - <bool>true</bool> - </property> - <property name="allColumnsShowFocus"> - <bool>true</bool> - </property> - <column> - <property name="text"> - <string>Action</string> - </property> - </column> - <column> - <property name="text"> - <string>Path</string> - </property> - </column> - <column> - <property name="text"> - <string>Copy from</string> - </property> - </column> - </widget> - </item> - <item> <layout class="QGridLayout" name="gridLayout"> <item row="0" column="0"> <widget class="QPushButton" name="nextButton"> @@ -317,6 +329,16 @@ </property> </widget> </item> + <item row="0" column="2"> + <widget class="QCheckBox" name="stopCheckBox"> + <property name="toolTip"> + <string>Select to stop listing log messages at a copy or move</string> + </property> + <property name="text"> + <string>Stop on Copy/Move</string> + </property> + </widget> + </item> <item row="0" column="3" rowspan="2"> <widget class="Line" name="line"> <property name="frameShadow"> @@ -330,17 +352,27 @@ </property> </widget> </item> - <item row="0" column="2"> - <widget class="QCheckBox" name="stopCheckBox"> + <item row="0" column="4"> + <widget class="QToolButton" name="upButton"> <property name="toolTip"> - <string>Select to stop listing log messages at a copy or move</string> + <string>Press to move up in the log list</string> </property> - <property name="text"> - <string>Stop on Copy/Move</string> + <property name="autoRepeat"> + <bool>true</bool> </property> </widget> </item> - <item row="0" column="4"> + <item row="0" column="5"> + <widget class="QToolButton" name="downButton"> + <property name="toolTip"> + <string>Press to move down in the log list</string> + </property> + <property name="autoRepeat"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="6"> <widget class="QPushButton" name="diffP1Button"> <property name="toolTip"> <string>Press to generate a diff to the first parent revision</string> @@ -350,7 +382,7 @@ </property> </widget> </item> - <item row="0" column="5"> + <item row="0" column="7"> <widget class="QPushButton" name="diffP2Button"> <property name="toolTip"> <string>Press to generate a diff to the second parent revision</string> @@ -360,7 +392,7 @@ </property> </widget> </item> - <item row="0" column="6"> + <item row="0" column="8"> <widget class="QPushButton" name="diffRevisionsButton"> <property name="toolTip"> <string>Press to compare two revisions</string> @@ -370,7 +402,7 @@ </property> </widget> </item> - <item row="0" column="7" rowspan="2"> + <item row="0" column="9" rowspan="2"> <widget class="Line" name="phaseLine"> <property name="frameShadow"> <enum>QFrame::Raised</enum> @@ -383,7 +415,17 @@ </property> </widget> </item> - <item row="0" column="9"> + <item row="0" column="10"> + <widget class="QToolButton" name="actionsButton"> + <property name="toolTip"> + <string>Select action from menu</string> + </property> + <property name="popupMode"> + <enum>QToolButton::InstantPopup</enum> + </property> + </widget> + </item> + <item row="0" column="11"> <spacer> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -391,12 +433,12 @@ <property name="sizeHint" stdset="0"> <size> <width>38</width> - <height>29</height> + <height>18</height> </size> </property> </spacer> </item> - <item row="1" column="4" colspan="3"> + <item row="1" column="4" colspan="5"> <widget class="QCheckBox" name="sbsCheckBox"> <property name="toolTip"> <string>Select to show differences side-by-side</string> @@ -406,16 +448,6 @@ </property> </widget> </item> - <item row="0" column="8"> - <widget class="QToolButton" name="actionsButton"> - <property name="toolTip"> - <string>Select action from menu</string> - </property> - <property name="popupMode"> - <enum>QToolButton::InstantPopup</enum> - </property> - </widget> - </item> </layout> </item> <item> @@ -539,6 +571,8 @@ <tabstop>nextButton</tabstop> <tabstop>limitSpinBox</tabstop> <tabstop>stopCheckBox</tabstop> + <tabstop>upButton</tabstop> + <tabstop>downButton</tabstop> <tabstop>diffP1Button</tabstop> <tabstop>diffP2Button</tabstop> <tabstop>diffRevisionsButton</tabstop>
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py --- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,551 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2010 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing a dialog to show the output of the hg log command process. -""" - -from __future__ import unicode_literals -try: - str = unicode -except NameError: - pass - -import os - -from PyQt5.QtCore import pyqtSlot, QProcess, QTimer, QUrl, QByteArray, \ - qVersion -from PyQt5.QtGui import QTextCursor -from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QApplication, QLineEdit - -from E5Gui.E5Application import e5App -from E5Gui import E5MessageBox - -from .Ui_HgLogDialog import Ui_HgLogDialog - -import Utilities - - -class HgLogDialog(QWidget, Ui_HgLogDialog): - """ - Class implementing a dialog to show the output of the hg log command - process. - - The dialog is nonmodal. Clicking a link in the upper text pane shows - a diff of the revisions. - """ - def __init__(self, vcs, mode="log", bundle=None, isFile=False, - parent=None): - """ - Constructor - - @param vcs reference to the vcs object - @param mode mode of the dialog (string; one of log, incoming, outgoing) - @param bundle name of a bundle file (string) - @param isFile flag indicating log for a file is to be shown (boolean) - @param parent parent widget (QWidget) - """ - super(HgLogDialog, self).__init__(parent) - self.setupUi(self) - - self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) - - self.process = QProcess() - self.vcs = vcs - if mode in ("log", "incoming", "outgoing"): - self.mode = mode - else: - self.mode = "log" - self.bundle = bundle - self.__hgClient = self.vcs.getClient() - - self.contents.setHtml( - self.tr('<b>Processing your request, please wait...</b>')) - - self.process.finished.connect(self.__procFinished) - self.process.readyReadStandardOutput.connect(self.__readStdout) - self.process.readyReadStandardError.connect(self.__readStderr) - - self.contents.anchorClicked.connect(self.__sourceChanged) - - self.revisions = [] # stack of remembered revisions - self.revString = self.tr('Revision') - self.projectMode = False - - self.logEntries = [] # list of log entries - self.lastLogEntry = {} - self.fileCopies = {} - self.endInitialText = False - self.initialText = [] - - self.diff = None - - self.sbsCheckBox.setEnabled(isFile) - self.sbsCheckBox.setVisible(isFile) - - def closeEvent(self, e): - """ - Protected slot implementing a close event handler. - - @param e close event (QCloseEvent) - """ - if self.__hgClient: - if self.__hgClient.isExecuting(): - self.__hgClient.cancel() - else: - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) - - e.accept() - - def start(self, fn, noEntries=0, revisions=None): - """ - Public slot to start the hg log command. - - @param fn filename to show the log for (string) - @param noEntries number of entries to show (integer) - @param revisions revisions to show log for (list of strings) - """ - self.errorGroup.hide() - QApplication.processEvents() - - self.intercept = False - self.filename = fn - self.dname, self.fname = self.vcs.splitPath(fn) - - # find the root of the repo - self.repodir = self.dname - while not os.path.isdir(os.path.join(self.repodir, self.vcs.adminDir)): - self.repodir = os.path.dirname(self.repodir) - if os.path.splitdrive(self.repodir)[1] == os.sep: - return - - self.projectMode = (self.fname == "." and self.dname == self.repodir) - - self.activateWindow() - self.raise_() - - preargs = [] - args = self.vcs.initCommand(self.mode) - if noEntries and self.mode == "log": - args.append('--limit') - args.append(str(noEntries)) - if self.mode in ("incoming", "outgoing"): - args.append("--newest-first") - if self.vcs.hasSubrepositories(): - args.append("--subrepos") - if self.mode == "log": - args.append('--copies') - args.append('--template') - args.append(os.path.join(os.path.dirname(__file__), - "templates", - "logDialogBookmarkPhase.tmpl")) - if self.mode == "incoming": - if self.bundle: - args.append(self.bundle) - elif not self.vcs.hasSubrepositories(): - project = e5App().getObject("Project") - self.vcs.bundleFile = os.path.join( - project.getProjectManagementDir(), "hg-bundle.hg") - if os.path.exists(self.vcs.bundleFile): - os.remove(self.vcs.bundleFile) - preargs = args[:] - preargs.append("--quiet") - preargs.append('--bundle') - preargs.append(self.vcs.bundleFile) - args.append(self.vcs.bundleFile) - if revisions: - for rev in revisions: - args.append("--rev") - args.append(rev) - if not self.projectMode: - args.append(self.filename) - - if self.__hgClient: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - - if preargs: - out, err = self.__hgClient.runcommand(preargs) - else: - err = "" - if err: - self.__showError(err) - elif self.mode != "incoming" or \ - (self.vcs.bundleFile and - os.path.exists(self.vcs.bundleFile)) or \ - self.bundle: - out, err = self.__hgClient.runcommand(args) - if err: - self.__showError(err) - if out and self.isVisible(): - for line in out.splitlines(True): - self.__processOutputLine(line) - if self.__hgClient.wasCanceled(): - break - self.__finish() - else: - self.process.kill() - - self.process.setWorkingDirectory(self.repodir) - - if preargs: - process = QProcess() - process.setWorkingDirectory(self.repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - process.waitForFinished(30000) - - if self.mode != "incoming" or \ - (self.vcs.bundleFile and - os.path.exists(self.vcs.bundleFile)) or \ - self.bundle: - self.process.start('hg', args) - procStarted = self.process.waitForStarted(5000) - if not procStarted: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - E5MessageBox.critical( - self, - self.tr('Process Generation Error'), - self.tr( - 'The process {0} could not be started. ' - 'Ensure, that it is in the search path.' - ).format('hg')) - else: - self.__finish() - - def __getParents(self, rev): - """ - Private method to get the parents of the currently viewed - file/directory. - - @param rev revision number to get parents for (string) - @return list of parent revisions (list of strings) - """ - errMsg = "" - parents = [] - - if int(rev) > 0: - args = self.vcs.initCommand("parents") - if self.mode == "incoming": - if self.bundle: - args.append("--repository") - args.append(self.bundle) - elif self.vcs.bundleFile and \ - os.path.exists(self.vcs.bundleFile): - args.append("--repository") - args.append(self.vcs.bundleFile) - args.append("--template") - args.append("{rev}:{node|short}\n") - args.append("-r") - args.append(rev) - if not self.projectMode: - args.append(self.filename) - - output = "" - if self.__hgClient: - output, errMsg = self.__hgClient.runcommand(args) - else: - process = QProcess() - process.setWorkingDirectory(self.repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.vcs.getEncoding(), 'replace') - else: - if not finished: - errMsg = self.tr( - "The hg process did not finish within 30s.") - else: - errMsg = self.tr("Could not start the hg executable.") - - if errMsg: - E5MessageBox.critical( - self, - self.tr("Mercurial Error"), - errMsg) - - if output: - parents = [p for p in output.strip().splitlines()] - - return parents - - def __procFinished(self, exitCode, exitStatus): - """ - Private slot connected to the finished signal. - - @param exitCode exit code of the process (integer) - @param exitStatus exit status of the process (QProcess.ExitStatus) - """ - self.__finish() - - def __finish(self): - """ - Private slot called when the process finished or the user pressed - the button. - """ - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - - self.contents.clear() - - if not self.logEntries: - self.errors.append(self.tr("No log available for '{0}'") - .format(self.filename)) - self.errorGroup.show() - return - - html = "" - - if self.initialText: - for line in self.initialText: - html += Utilities.html_encode(line.strip()) - html += '<br />\n' - html += '{0}<br/>\n'.format(80 * "=") - - for entry in self.logEntries: - fileCopies = {} - if entry["file_copies"]: - for fentry in entry["file_copies"].split(", "): - newName, oldName = fentry[:-1].split(" (") - fileCopies[newName] = oldName - - rev, hexRev = entry["change"].split(":") - dstr = '<p><b>{0} {1}</b>'.format(self.revString, entry["change"]) - if entry["parents"]: - parents = entry["parents"].split() - else: - parents = self.__getParents(rev) - for parent in parents: - url = QUrl() - url.setScheme("file") - url.setPath(self.filename) - if qVersion() >= "5.0.0": - query = parent.split(":")[0] + '_' + rev - url.setQuery(query) - else: - query = QByteArray() - query.append(parent.split(":")[0]).append('_').append(rev) - url.setEncodedQuery(query) - dstr += ' [<a href="{0}" name="{1}" id="{1}">{2}</a>]'.format( - url.toString(), query, - self.tr('diff to {0}').format(parent), - ) - dstr += '<br />\n' - html += dstr - - if "phase" in entry: - html += self.tr("Phase: {0}<br />\n")\ - .format(entry["phase"]) - - html += self.tr("Branch: {0}<br />\n")\ - .format(entry["branches"]) - - html += self.tr("Tags: {0}<br />\n").format(entry["tags"]) - - if "bookmarks" in entry: - html += self.tr("Bookmarks: {0}<br />\n")\ - .format(entry["bookmarks"]) - - html += self.tr("Parents: {0}<br />\n")\ - .format(entry["parents"]) - - html += self.tr('<i>Author: {0}</i><br />\n')\ - .format(Utilities.html_encode(entry["user"])) - - date, time = entry["date"].split()[:2] - html += self.tr('<i>Date: {0}, {1}</i><br />\n')\ - .format(date, time) - - for line in entry["description"]: - html += Utilities.html_encode(line.strip()) - html += '<br />\n' - - if entry["file_adds"]: - html += '<br />\n' - for f in entry["file_adds"].strip().split(", "): - if f in fileCopies: - html += self.tr( - 'Added {0} (copied from {1})<br />\n')\ - .format(Utilities.html_encode(f), - Utilities.html_encode(fileCopies[f])) - else: - html += self.tr('Added {0}<br />\n')\ - .format(Utilities.html_encode(f)) - - if entry["files_mods"]: - html += '<br />\n' - for f in entry["files_mods"].strip().split(", "): - html += self.tr('Modified {0}<br />\n')\ - .format(Utilities.html_encode(f)) - - if entry["file_dels"]: - html += '<br />\n' - for f in entry["file_dels"].strip().split(", "): - html += self.tr('Deleted {0}<br />\n')\ - .format(Utilities.html_encode(f)) - - html += '</p>{0}<br/>\n'.format(60 * "=") - - self.contents.setHtml(html) - tc = self.contents.textCursor() - tc.movePosition(QTextCursor.Start) - self.contents.setTextCursor(tc) - self.contents.ensureCursorVisible() - - def __readStdout(self): - """ - Private slot to handle the readyReadStandardOutput signal. - - It reads the output of the process and inserts it into a buffer. - """ - self.process.setReadChannel(QProcess.StandardOutput) - - while self.process.canReadLine(): - s = str(self.process.readLine(), self.vcs.getEncoding(), 'replace') - self.__processOutputLine(s) - - def __processOutputLine(self, line): - """ - Private method to process the lines of output. - - @param line output line to be processed (string) - """ - if line == "@@@\n": - self.logEntries.append(self.lastLogEntry) - self.lastLogEntry = {} - self.fileCopies = {} - else: - try: - key, value = line.split("|", 1) - except ValueError: - key = "" - value = line - if key == "change": - self.endInitialText = True - if key in ("change", "tags", "parents", "user", "date", - "file_copies", "file_adds", "files_mods", "file_dels", - "bookmarks", "phase"): - self.lastLogEntry[key] = value.strip() - elif key == "branches": - if value.strip(): - self.lastLogEntry[key] = value.strip() - else: - self.lastLogEntry[key] = "default" - elif key == "description": - self.lastLogEntry[key] = [value.strip()] - else: - if self.endInitialText: - self.lastLogEntry["description"].append(value.strip()) - else: - self.initialText.append(value) - - def __readStderr(self): - """ - Private slot to handle the readyReadStandardError signal. - - It reads the error output of the process and inserts it into the - error pane. - """ - if self.process is not None: - s = str(self.process.readAllStandardError(), - self.vcs.getEncoding(), 'replace') - self.__showError(s) - - def __showError(self, out): - """ - Private slot to show some error. - - @param out error to be shown (string) - """ - self.errorGroup.show() - self.errors.insertPlainText(out) - self.errors.ensureCursorVisible() - - def __sourceChanged(self, url): - """ - Private slot to handle the sourceChanged signal of the contents pane. - - @param url the url that was clicked (QUrl) - """ - filename = url.path() - if Utilities.isWindowsPlatform(): - if filename.startswith("/"): - filename = filename[1:] - if qVersion() >= "5.0.0": - ver = url.query() - else: - ver = bytes(url.encodedQuery()).decode() - v1, v2 = ver.split('_') - if v1 == "" or v2 == "": - return - self.contents.scrollToAnchor(ver) - - if self.sbsCheckBox.isEnabled() and self.sbsCheckBox.isChecked(): - self.vcs.hgSbsDiff(filename, revisions=(v1, v2)) - else: - if self.diff is None: - from .HgDiffDialog import HgDiffDialog - self.diff = HgDiffDialog(self.vcs) - self.diff.show() - self.diff.start(filename, [v1, v2], self.bundle) - - def on_passwordCheckBox_toggled(self, isOn): - """ - Private slot to handle the password checkbox toggled. - - @param isOn flag indicating the status of the check box (boolean) - """ - if isOn: - self.input.setEchoMode(QLineEdit.Password) - else: - self.input.setEchoMode(QLineEdit.Normal) - - @pyqtSlot() - def on_sendButton_clicked(self): - """ - Private slot to send the input to the hg process. - """ - input = self.input.text() - input += os.linesep - - if self.passwordCheckBox.isChecked(): - self.errors.insertPlainText(os.linesep) - self.errors.ensureCursorVisible() - else: - self.errors.insertPlainText(input) - self.errors.ensureCursorVisible() - - self.process.write(input) - - self.passwordCheckBox.setChecked(False) - self.input.clear() - - def on_input_returnPressed(self): - """ - Private slot to handle the press of the return key in the input field. - """ - self.intercept = True - self.on_sendButton_clicked() - - def keyPressEvent(self, evt): - """ - Protected slot to handle a key press event. - - @param evt the key press event (QKeyEvent) - """ - if self.intercept: - self.intercept = False - evt.accept() - return - super(HgLogDialog, self).keyPressEvent(evt)
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui --- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui Fri Jan 27 19:18:52 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,178 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>HgLogDialog</class> - <widget class="QWidget" name="HgLogDialog"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>751</width> - <height>649</height> - </rect> - </property> - <property name="windowTitle"> - <string>Mercurial Log</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QGroupBox" name="contentsGroup"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>3</verstretch> - </sizepolicy> - </property> - <property name="title"> - <string>Log</string> - </property> - <layout class="QVBoxLayout"> - <item> - <widget class="QTextBrowser" name="contents"> - <property name="whatsThis"> - <string><b>Mercurial Log</b><p>This shows the output of the hg log command. By clicking on the links you may show the difference between revisions.</p></string> - </property> - <property name="openLinks"> - <bool>false</bool> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QCheckBox" name="sbsCheckBox"> - <property name="toolTip"> - <string>Select to show differences side-by-side</string> - </property> - <property name="text"> - <string>Show differences side-by-side</string> - </property> - </widget> - </item> - <item> - <widget class="QGroupBox" name="errorGroup"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>1</verstretch> - </sizepolicy> - </property> - <property name="title"> - <string>Errors</string> - </property> - <layout class="QVBoxLayout"> - <item> - <widget class="QTextEdit" name="errors"> - <property name="whatsThis"> - <string><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></string> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="acceptRichText"> - <bool>false</bool> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="inputGroup"> - <property name="title"> - <string>Input</string> - </property> - <layout class="QGridLayout"> - <item row="1" column="1"> - <spacer> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>327</width> - <height>29</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="2"> - <widget class="QPushButton" name="sendButton"> - <property name="toolTip"> - <string>Press to send the input to the hg process</string> - </property> - <property name="text"> - <string>&Send</string> - </property> - <property name="shortcut"> - <string>Alt+S</string> - </property> - </widget> - </item> - <item row="0" column="0" colspan="3"> - <widget class="QLineEdit" name="input"> - <property name="toolTip"> - <string>Enter data to be sent to the hg process</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="passwordCheckBox"> - <property name="toolTip"> - <string>Select to switch the input field to password mode</string> - </property> - <property name="text"> - <string>&Password Mode</string> - </property> - <property name="shortcut"> - <string>Alt+P</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Close</set> - </property> - </widget> - </item> - </layout> - </widget> - <tabstops> - <tabstop>contents</tabstop> - <tabstop>sbsCheckBox</tabstop> - <tabstop>errors</tabstop> - <tabstop>input</tabstop> - <tabstop>passwordCheckBox</tabstop> - <tabstop>sendButton</tabstop> - <tabstop>buttonBox</tabstop> - </tabstops> - <resources/> - <connections> - <connection> - <sender>buttonBox</sender> - <signal>rejected()</signal> - <receiver>HgLogDialog</receiver> - <slot>close()</slot> - <hints> - <hint type="sourcelabel"> - <x>262</x> - <y>624</y> - </hint> - <hint type="destinationlabel"> - <x>271</x> - <y>647</y> - </hint> - </hints> - </connection> - </connections> -</ui>
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.py --- a/Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,177 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2011 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing a dialog to select revisions. -""" - -from __future__ import unicode_literals - -from PyQt5.QtCore import pyqtSlot -from PyQt5.QtWidgets import QDialog, QDialogButtonBox - -from .Ui_HgMultiRevisionSelectionDialog import \ - Ui_HgMultiRevisionSelectionDialog - - -class HgMultiRevisionSelectionDialog( - QDialog, Ui_HgMultiRevisionSelectionDialog): - """ - Class implementing a dialog to select revisions. - """ - def __init__(self, tagsList, branchesList, bookmarksList=None, - emptyRevsOk=False, showLimit=False, limitDefault=100, - parent=None): - """ - Constructor - - @param tagsList list of tags (list of strings) - @param branchesList list of branches (list of strings) - @param bookmarksList list of bookmarks (list of strings) - @param emptyRevsOk flag indicating that it is ok to not enter - revisions (boolean) - @param showLimit flag indicating to show the limit entry (boolean) - @param limitDefault default value for the limit (integer) - @param parent parent widget (QWidget) - """ - super(HgMultiRevisionSelectionDialog, self).__init__(parent) - self.setupUi(self) - - self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) - - self.__emptyRevsOk = emptyRevsOk - - self.tagCombo.addItems(sorted(tagsList)) - self.branchCombo.addItems(["default"] + sorted(branchesList)) - if bookmarksList is not None: - self.bookmarkCombo.addItems(sorted(bookmarksList)) - else: - self.bookmarkButton.setHidden(True) - self.bookmarkCombo.setHidden(True) - - self.limitSpinBox.setValue(limitDefault) - self.limitGroup.setVisible(showLimit) - - def __updateOK(self): - """ - Private slot to update the OK button. - """ - enabled = True - if self.changesetsButton.isChecked(): - enabled = self.changesetsEdit.toPlainText() != "" - elif self.tagButton.isChecked(): - enabled = self.tagCombo.currentText() != "" - elif self.branchButton.isChecked(): - enabled = self.branchCombo.currentText() != "" - elif self.bookmarkButton.isChecked(): - enabled = self.bookmarkCombo.currentText() != "" - if not enabled and self.__emptyRevsOk: - enabled = self.limitGroup.isChecked() - - self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enabled) - - @pyqtSlot(bool) - def on_changesetsButton_toggled(self, checked): - """ - Private slot to handle changes of the Changesets select button. - - @param checked state of the button (boolean) - """ - self.__updateOK() - - @pyqtSlot(bool) - def on_tagButton_toggled(self, checked): - """ - Private slot to handle changes of the Tag select button. - - @param checked state of the button (boolean) - """ - self.__updateOK() - - @pyqtSlot(bool) - def on_branchButton_toggled(self, checked): - """ - Private slot to handle changes of the Branch select button. - - @param checked state of the button (boolean) - """ - self.__updateOK() - - @pyqtSlot(bool) - def on_bookmarkButton_toggled(self, checked): - """ - Private slot to handle changes of the Bookmark select button. - - @param checked state of the button (boolean) - """ - self.__updateOK() - - @pyqtSlot() - def on_changesetsEdit_textChanged(self): - """ - Private slot to handle changes of the Changesets edit. - """ - self.__updateOK() - - @pyqtSlot(str) - def on_tagCombo_editTextChanged(self, txt): - """ - Private slot to handle changes of the Tag combo. - - @param txt text of the combo (string) - """ - self.__updateOK() - - @pyqtSlot(str) - def on_branchCombo_editTextChanged(self, txt): - """ - Private slot to handle changes of the Branch combo. - - @param txt text of the combo (string) - """ - self.__updateOK() - - @pyqtSlot(str) - def on_bookmarkCombo_editTextChanged(self, txt): - """ - Private slot to handle changes of the Bookmark combo. - - @param txt text of the combo (string) - """ - self.__updateOK() - - @pyqtSlot(bool) - def on_limitGroup_toggled(self, checked): - """ - Private slot to handle changes of the Limit Results group status. - - @param checked state of the group (boolean) - """ - self.__updateOK() - - def getRevisions(self): - """ - Public method to retrieve the selected revisions. - - @return tuple of selected revisions (list of strings) and number - of entries to be shown (integer) - """ - if self.changesetsButton.isChecked(): - revs = self.changesetsEdit.toPlainText().strip().splitlines() - elif self.tagButton.isChecked(): - revs = [self.tagCombo.currentText()] - elif self.branchButton.isChecked(): - revs = [self.branchCombo.currentText()] - elif self.bookmarkButton.isChecked(): - revs = [self.bookmarkCombo.currentText()] - else: - revs = [] - - if self.limitGroup.isChecked(): - limit = self.limitSpinBox.value() - else: - limit = 0 - - return revs, limit
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py --- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Fri Feb 03 19:20:59 2017 +0100 @@ -373,8 +373,6 @@ self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) - self.inputGroup.setEnabled(True) - self.inputGroup.show() self.refreshButton.setEnabled(False) def __finish(self): @@ -484,6 +482,11 @@ self.errorGroup.show() self.errors.insertPlainText(out) self.errors.ensureCursorVisible() + + if not self.__hgClient: + # show input in case the process asked for some input + self.inputGroup.setEnabled(True) + self.inputGroup.show() def on_passwordCheckBox_toggled(self, isOn): """
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.py --- a/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.py Fri Feb 03 19:20:59 2017 +0100 @@ -117,12 +117,21 @@ @param txt current text @type str """ + if txt != txt.strip(): + # get rid of whitespace + txt = txt.strip() + self.fingerprintEdit.setText(txt) + if txt.startswith(tuple( [h + ":" for h in HgUserConfigHostFingerprintDialog.supportedHashes])): parts = txt.split(":", 1) if len(parts) == 2: self.fingerprintEdit.setText(parts[1]) + hashIndex = self.hashComboBox.findText(parts[0].strip()) + if hashIndex > -1: + self.hashComboBox.setCurrentIndex(hashIndex) + self.__updateOkButton() def getData(self): @@ -137,7 +146,7 @@ else: fingerprint = "{0}:{1}".format( self.hashComboBox.currentText(), - self.fingerprintEdit.text() + self.fingerprintEdit.text().strip() ) - return self.hostEdit.text(), fingerprint + return self.hostEdit.text().strip(), fingerprint
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py --- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Fri Feb 03 19:20:59 2017 +0100 @@ -314,10 +314,6 @@ menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsLog.png"), - self.tr('Show log'), self._VCSLog) - self.vcsMenuActions.append(act) - act = menu.addAction( - UI.PixmapCache.getIcon("vcsLog.png"), self.tr('Show log browser'), self._VCSLogBrowser) self.vcsMenuActions.append(act) menu.addSeparator() @@ -547,10 +543,6 @@ menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsLog.png"), - self.tr('Show log'), self._VCSLog) - self.vcsDirMenuActions.append(act) - act = menu.addAction( - UI.PixmapCache.getIcon("vcsLog.png"), self.tr('Show log browser'), self._VCSLogBrowser) self.vcsDirMenuActions.append(act) menu.addSeparator()
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py --- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Fri Feb 03 19:20:59 2017 +0100 @@ -260,21 +260,6 @@ self.vcsExportAct.triggered.connect(self._vcsExport) self.actions.append(self.vcsExportAct) - self.vcsLogAct = E5Action( - self.tr('Show log'), - UI.PixmapCache.getIcon("vcsLog.png"), - self.tr('Show &log'), - 0, 0, self, 'mercurial_log') - self.vcsLogAct.setStatusTip(self.tr( - 'Show the log of the local project' - )) - self.vcsLogAct.setWhatsThis(self.tr( - """<b>Show log</b>""" - """<p>This shows the log of the local project.</p>""" - )) - self.vcsLogAct.triggered.connect(self._vcsLog) - self.actions.append(self.vcsLogAct) - self.hgLogBrowserAct = E5Action( self.tr('Show log browser'), UI.PixmapCache.getIcon("vcsLog.png"), @@ -1444,7 +1429,6 @@ menu.addMenu(branchesMenu) menu.addMenu(bookmarksMenu) menu.addSeparator() - menu.addAction(self.vcsLogAct) menu.addAction(self.hgLogBrowserAct) menu.addSeparator() menu.addAction(self.vcsStatusAct) @@ -1505,7 +1489,6 @@ toolbarManager.addAction(self.vcsCommitAct, title) toolbarManager.addAction(self.hgPushAct, title) toolbarManager.addAction(self.hgPushForcedAct, title) - toolbarManager.addAction(self.vcsLogAct, title) toolbarManager.addAction(self.hgExtDiffAct, title) toolbarManager.addAction(self.hgSummaryAct, title) toolbarManager.addAction(self.vcsRevertAct, title)
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsMercurial/hg.py --- a/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Feb 03 19:20:59 2017 +0100 @@ -828,39 +828,6 @@ project.removeFile(name) return res - def vcsLog(self, name): - """ - Public method used to view the log of a file/directory from the - Mercurial repository. - - @param name file/directory name to show the log of (string) - """ - dname, fname = self.splitPath(name) - isFile = os.path.isfile(name) - - # find the root of the repo - repodir = dname - while not os.path.isdir(os.path.join(repodir, self.adminDir)): - repodir = os.path.dirname(repodir) - if os.path.splitdrive(repodir)[1] == os.sep: - return - - from .HgMultiRevisionSelectionDialog import \ - HgMultiRevisionSelectionDialog - dlg = HgMultiRevisionSelectionDialog( - self.hgGetTagsList(repodir), - self.hgGetBranchesList(repodir), - self.hgGetBookmarksList(repodir), - emptyRevsOk=True, - showLimit=True, - limitDefault=self.getPlugin().getPreferences("LogLimit")) - if dlg.exec_() == QDialog.Accepted: - revs, noEntries = dlg.getRevisions() - from .HgLogDialog import HgLogDialog - self.log = HgLogDialog(self, isFile=isFile) - self.log.show() - self.log.start(name, noEntries=noEntries, revisions=revs) - def vcsDiff(self, name): """ Public method used to view the difference of a file/directory to the @@ -1938,19 +1905,13 @@ @param name file/directory name to show the log of (string) """ - if self.getPlugin().getPreferences("UseLogBrowser"): - if self.logBrowserIncoming is None: - from .HgLogBrowserDialog import HgLogBrowserDialog - self.logBrowserIncoming = HgLogBrowserDialog( - self, mode="incoming") - self.logBrowserIncoming.show() - self.logBrowserIncoming.raise_() - self.logBrowserIncoming.start(name) - else: - from .HgLogDialog import HgLogDialog - self.log = HgLogDialog(self, mode="incoming") - self.log.show() - self.log.start(name) + if self.logBrowserIncoming is None: + from .HgLogBrowserDialog import HgLogBrowserDialog + self.logBrowserIncoming = HgLogBrowserDialog( + self, mode="incoming") + self.logBrowserIncoming.show() + self.logBrowserIncoming.raise_() + self.logBrowserIncoming.start(name) def hgOutgoing(self, name): """ @@ -1959,19 +1920,13 @@ @param name file/directory name to show the log of (string) """ - if self.getPlugin().getPreferences("UseLogBrowser"): - if self.logBrowserOutgoing is None: - from .HgLogBrowserDialog import HgLogBrowserDialog - self.logBrowserOutgoing = HgLogBrowserDialog( - self, mode="outgoing") - self.logBrowserOutgoing.show() - self.logBrowserOutgoing.raise_() - self.logBrowserOutgoing.start(name) - else: - from .HgLogDialog import HgLogDialog - self.log = HgLogDialog(self, mode="outgoing") - self.log.show() - self.log.start(name) + if self.logBrowserOutgoing is None: + from .HgLogBrowserDialog import HgLogBrowserDialog + self.logBrowserOutgoing = HgLogBrowserDialog( + self, mode="outgoing") + self.logBrowserOutgoing.show() + self.logBrowserOutgoing.raise_() + self.logBrowserOutgoing.start(name) def hgPull(self, name): """ @@ -2651,19 +2606,13 @@ if file: self.__lastChangeGroupPath = os.path.dirname(file) - if self.getPlugin().getPreferences("UseLogBrowser"): - if self.logBrowserIncoming is None: - from .HgLogBrowserDialog import HgLogBrowserDialog - self.logBrowserIncoming = \ - HgLogBrowserDialog(self, mode="incoming") - self.logBrowserIncoming.show() - self.logBrowserIncoming.raise_() - self.logBrowserIncoming.start(name, bundle=file) - else: - from .HgLogDialog import HgLogDialog - self.log = HgLogDialog(self, mode="incoming", bundle=file) - self.log.show() - self.log.start(name) + if self.logBrowserIncoming is None: + from .HgLogBrowserDialog import HgLogBrowserDialog + self.logBrowserIncoming = \ + HgLogBrowserDialog(self, mode="incoming") + self.logBrowserIncoming.show() + self.logBrowserIncoming.raise_() + self.logBrowserIncoming.start(name, bundle=file) def hgUnbundle(self, name): """
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsMercurial/templates/logBrowserBookmarkPhase.tmpl --- a/Plugins/VcsPlugins/vcsMercurial/templates/logBrowserBookmarkPhase.tmpl Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/templates/logBrowserBookmarkPhase.tmpl Fri Feb 03 19:20:59 2017 +0100 @@ -11,4 +11,5 @@ tags|{join(tags,', ')} bookmarks|{join(bookmarks,', ')} phase|{phase} +latesttag|{latesttag} @@@
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsMercurial/templates/logDialogBookmarkPhase.tmpl --- a/Plugins/VcsPlugins/vcsMercurial/templates/logDialogBookmarkPhase.tmpl Fri Jan 27 19:18:52 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -change|{rev}:{node|short} -branches|{branch} -tags|{join(tags,', ')} -parents|{parents} -user|{author} -date|{date|isodate} -description|{desc} -file_copies|{join(file_copies,', ')} -file_adds|{join(file_adds,', ')} -files_mods|{join(file_mods,', ')} -file_dels|{join(file_dels,', ')} -bookmarks|{join(bookmarks,', ')} -phase|{phase} -@@@
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py --- a/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Fri Feb 03 19:20:59 2017 +0100 @@ -254,10 +254,6 @@ menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsLog.png"), - self.tr('Show log'), self._VCSLog) - self.vcsMenuActions.append(act) - act = menu.addAction( - UI.PixmapCache.getIcon("vcsLog.png"), self.tr('Show log browser'), self._VCSLogBrowser) self.vcsMenuActions.append(act) menu.addSeparator() @@ -566,10 +562,6 @@ menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsLog.png"), - self.tr('Show log'), self._VCSLog) - self.vcsDirMenuActions.append(act) - act = menu.addAction( - UI.PixmapCache.getIcon("vcsLog.png"), self.tr('Show log browser'), self._VCSLogBrowser) self.vcsDirMenuActions.append(act) menu.addSeparator()
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py --- a/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Fri Feb 03 19:20:59 2017 +0100 @@ -96,21 +96,6 @@ self.vcsCommitAct.triggered.connect(self._vcsCommit) self.actions.append(self.vcsCommitAct) - self.vcsLogAct = E5Action( - self.tr('Show log'), - UI.PixmapCache.getIcon("vcsLog.png"), - self.tr('Show &log'), - 0, 0, self, 'pysvn_log') - self.vcsLogAct.setStatusTip(self.tr( - 'Show the log of the local project' - )) - self.vcsLogAct.setWhatsThis(self.tr( - """<b>Show log</b>""" - """<p>This shows the log of the local project.</p>""" - )) - self.vcsLogAct.triggered.connect(self._vcsLog) - self.actions.append(self.vcsLogAct) - self.svnLogBrowserAct = E5Action( self.tr('Show log browser'), UI.PixmapCache.getIcon("vcsLog.png"), @@ -526,7 +511,6 @@ else: menu.addAction(self.svnListAct) menu.addSeparator() - menu.addAction(self.vcsLogAct) menu.addAction(self.svnLogBrowserAct) menu.addSeparator() menu.addAction(self.vcsStatusAct) @@ -588,7 +572,6 @@ toolbarManager.addToolBar(self.__toolbar, title) toolbarManager.addAction(self.vcsUpdateAct, title) toolbarManager.addAction(self.vcsCommitAct, title) - toolbarManager.addAction(self.vcsLogAct, title) toolbarManager.addAction(self.svnExtDiffAct, title) toolbarManager.addAction(self.svnUrlDiffAct, title) toolbarManager.addAction(self.svnChangeListsAct, title)
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py --- a/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Fri Feb 03 19:20:59 2017 +0100 @@ -26,6 +26,8 @@ from .Ui_SvnLogBrowserDialog import Ui_SvnLogBrowserDialog +import UI.PixmapCache + class SvnLogBrowserDialog(QWidget, SvnDialogMixin, Ui_SvnLogBrowserDialog): """ @@ -47,6 +49,9 @@ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) + self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png")) + self.filesTree.headerItem().setText(self.filesTree.columnCount(), "") self.filesTree.header().setSortIndicator(0, Qt.AscendingOrder) @@ -68,6 +73,11 @@ 'R': self.tr('Replaced'), } + self.__logTreeNormalFont = self.logTree.font() + self.__logTreeNormalFont.setBold(False) + self.__logTreeBoldFont = self.logTree.font() + self.__logTreeBoldFont.setBold(True) + self.client = self.vcs.getClient() self.client.callback_cancel = \ self._clientCancelCallback @@ -427,6 +437,19 @@ self.diffPreviousButton.setEnabled( current != self.logTree.topLevelItem( self.logTree.topLevelItemCount() - 1)) + + # Highlight the current entry using a bold font + for col in range(self.logTree.columnCount()): + current and current.setFont(col, self.__logTreeBoldFont) + previous and previous.setFont(col, self.__logTreeNormalFont) + + # set the state of the up and down buttons + self.upButton.setEnabled( + current is not None and + self.logTree.indexOfTopLevelItem(current) > 0) + self.downButton.setEnabled( + current is not None and + int(current.text(0)) > 1) @pyqtSlot() def on_logTree_itemSelectionChanged(self): @@ -586,3 +609,25 @@ int(self.stopCheckBox.isChecked())) self.nextButton.setEnabled(True) self.limitSpinBox.setEnabled(True) + + @pyqtSlot() + def on_upButton_clicked(self): + """ + Private slot to move the current item up one entry. + """ + itm = self.logTree.itemAbove(self.logTree.currentItem()) + if itm: + self.logTree.setCurrentItem(itm) + + @pyqtSlot() + def on_downButton_clicked(self): + """ + Private slot to move the current item down one entry. + """ + itm = self.logTree.itemBelow(self.logTree.currentItem()) + if itm: + self.logTree.setCurrentItem(itm) + else: + # load the next bunch and try again + self.on_nextButton_clicked() + self.on_downButton_clicked()
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.ui --- a/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.ui Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.ui Fri Feb 03 19:20:59 2017 +0100 @@ -228,14 +228,34 @@ </property> </widget> </item> - <item row="0" column="3" rowspan="2"> + <item row="0" column="3" rowspan="2" colspan="2"> <widget class="Line" name="line"> <property name="orientation"> <enum>Qt::Vertical</enum> </property> </widget> </item> - <item row="0" column="4"> + <item row="0" column="5"> + <widget class="QToolButton" name="upButton"> + <property name="toolTip"> + <string>Press to move up in the log list</string> + </property> + <property name="autoRepeat"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="6"> + <widget class="QToolButton" name="downButton"> + <property name="toolTip"> + <string>Press to move down in the log list</string> + </property> + <property name="autoRepeat"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="7"> <widget class="QPushButton" name="diffPreviousButton"> <property name="toolTip"> <string>Press to generate a diff to the previous revision</string> @@ -245,7 +265,7 @@ </property> </widget> </item> - <item row="0" column="5"> + <item row="0" column="8"> <widget class="QPushButton" name="diffRevisionsButton"> <property name="toolTip"> <string>Press to compare two revisions</string> @@ -255,7 +275,7 @@ </property> </widget> </item> - <item row="0" column="6"> + <item row="0" column="9"> <spacer> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -268,7 +288,7 @@ </property> </spacer> </item> - <item row="1" column="4" colspan="3"> + <item row="1" column="4" colspan="6"> <widget class="QCheckBox" name="sbsCheckBox"> <property name="toolTip"> <string>Select to show differences side-by-side</string> @@ -310,10 +330,11 @@ <tabstop>nextButton</tabstop> <tabstop>limitSpinBox</tabstop> <tabstop>stopCheckBox</tabstop> + <tabstop>upButton</tabstop> + <tabstop>downButton</tabstop> <tabstop>diffPreviousButton</tabstop> <tabstop>diffRevisionsButton</tabstop> <tabstop>sbsCheckBox</tabstop> - <tabstop>buttonBox</tabstop> </tabstops> <resources/> <connections/>
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py --- a/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,276 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2003 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing a dialog to show the output of the svn log command process. -""" - -from __future__ import unicode_literals - -import os -import sys - -import pysvn - -from PyQt5.QtCore import QMutexLocker, QUrl, Qt, QByteArray, qVersion -from PyQt5.QtGui import QCursor, QTextCursor -from PyQt5.QtWidgets import QWidget, QApplication, QDialogButtonBox - -from .SvnUtilities import formatTime - -from .SvnDialogMixin import SvnDialogMixin -from .Ui_SvnLogDialog import Ui_SvnLogDialog - -import Utilities - - -class SvnLogDialog(QWidget, SvnDialogMixin, Ui_SvnLogDialog): - """ - Class implementing a dialog to show the output of the svn log command. - - The dialog is nonmodal. Clicking a link in the upper text pane shows - a diff of the versions. - """ - def __init__(self, vcs, isFile=False, parent=None): - """ - Constructor - - @param vcs reference to the vcs object - @param isFile flag indicating log for a file is to be shown (boolean) - @param parent parent widget (QWidget) - """ - super(SvnLogDialog, self).__init__(parent) - self.setupUi(self) - SvnDialogMixin.__init__(self) - - self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) - self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) - - self.vcs = vcs - - self.contents.setHtml( - self.tr('<b>Processing your request, please wait...</b>')) - - self.contents.anchorClicked.connect(self.__sourceChanged) - - self.flags = { - 'A': self.tr('Added'), - 'D': self.tr('Deleted'), - 'M': self.tr('Modified') - } - - self.revString = self.tr('revision') - self.diff = None - - self.sbsCheckBox.setEnabled(isFile) - self.sbsCheckBox.setVisible(isFile) - - self.client = self.vcs.getClient() - self.client.callback_cancel = \ - self._clientCancelCallback - self.client.callback_get_login = \ - self._clientLoginCallback - self.client.callback_ssl_server_trust_prompt = \ - self._clientSslServerTrustPromptCallback - - def start(self, fn, noEntries=0): - """ - Public slot to start the svn log command. - - @param fn filename to show the log for (string) - @param noEntries number of entries to show (integer) - """ - self.errorGroup.hide() - - fetchLimit = 10 - - QApplication.setOverrideCursor(QCursor(Qt.WaitCursor)) - QApplication.processEvents() - - self.filename = fn - dname, fname = self.vcs.splitPath(fn) - - opts = self.vcs.options['global'] + self.vcs.options['log'] - verbose = "--verbose" in opts - - self.activateWindow() - self.raise_() - - locker = QMutexLocker(self.vcs.vcsExecutionMutex) - cwd = os.getcwd() - os.chdir(dname) - try: - nextRev = 0 - fetched = 0 - logs = [] - limit = noEntries or 9999999 - while fetched < limit: - flimit = min(fetchLimit, limit - fetched) - if fetched == 0: - revstart = pysvn.Revision(pysvn.opt_revision_kind.head) - else: - revstart = pysvn.Revision( - pysvn.opt_revision_kind.number, nextRev) - allLogs = self.client.log(fname, - revision_start=revstart, - discover_changed_paths=verbose, - limit=flimit + 1, - strict_node_history=False) - if len(allLogs) <= flimit or self._clientCancelCallback(): - logs.extend(allLogs) - break - else: - logs.extend(allLogs[:-1]) - nextRev = allLogs[-1]["revision"].number - fetched += fetchLimit - locker.unlock() - - self.contents.clear() - self.__pegRev = None - for log in logs: - ver = "{0:d}".format(log["revision"].number) - dstr = '<b>{0} {1}</b>'.format(self.revString, ver) - if self.__pegRev is None: - self.__pegRev = int(ver) - try: - lv = "{0:d}".format( - logs[logs.index(log) + 1]["revision"].number) - url = QUrl() - url.setScheme("file") - url.setPath(self.filename) - if qVersion() >= "5.0.0": - query = lv + '_' + ver - url.setQuery(query) - else: - query = QByteArray() - query.append(lv).append('_').append(ver) - url.setEncodedQuery(query) - dstr += ' [<a href="{0}" name="{1}">{2}</a>]'.format( - url.toString(), query, - self.tr('diff to {0}').format(lv) - ) - except IndexError: - pass - dstr += '<br />\n' - self.contents.insertHtml(dstr) - - author = log["author"] - message = log["message"] - if sys.version_info[0] == 2: - author = author.decode('utf-8') - message = message.decode('utf-8') - dstr = self.tr('<i>author: {0}</i><br />\n')\ - .format(author) - self.contents.insertHtml(dstr) - - dstr = self.tr('<i>date: {0}</i><br />\n')\ - .format(formatTime(log["date"])) - self.contents.insertHtml(dstr) - - self.contents.insertHtml('<br />\n') - - for line in message.splitlines(): - self.contents.insertHtml(Utilities.html_encode(line)) - self.contents.insertHtml('<br />\n') - - if len(log['changed_paths']) > 0: - self.contents.insertHtml('<br />\n') - for changeInfo in log['changed_paths']: - action = changeInfo["action"] - path = changeInfo["path"] - if sys.version_info[0] == 2: - action = action.decode('utf-8') - path = path.decode('utf-8') - dstr = '{0} {1}'.format(self.flags[action], path) - if changeInfo["copyfrom_path"] is not None: - copyfrom_path = changeInfo["copyfrom_path"] - if sys.version_info[0] == 2: - copyfrom_path = copyfrom_path.decode('utf-8') - dstr += self.tr( - " (copied from {0}, revision {1})")\ - .format(copyfrom_path, - changeInfo["copyfrom_revision"].number) - dstr += '<br />\n' - self.contents.insertHtml(dstr) - - self.contents.insertHtml('<hr /><br />\n') - except pysvn.ClientError as e: - locker.unlock() - self.__showError(e.args[0]) - os.chdir(cwd) - self.__finish() - - def __finish(self): - """ - Private slot called when the user pressed the button. - """ - QApplication.restoreOverrideCursor() - - self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) - self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) - self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) - - tc = self.contents.textCursor() - tc.movePosition(QTextCursor.Start) - self.contents.setTextCursor(tc) - self.contents.ensureCursorVisible() - - self._cancel() - - def on_buttonBox_clicked(self, button): - """ - Private slot called by a button of the button box clicked. - - @param button button that was clicked (QAbstractButton) - """ - if button == self.buttonBox.button(QDialogButtonBox.Close): - self.close() - elif button == self.buttonBox.button(QDialogButtonBox.Cancel): - self.__finish() - - def __sourceChanged(self, url): - """ - Private slot to handle the sourceChanged signal of the contents pane. - - @param url the url that was clicked (QUrl) - """ - self.contents.setSource(QUrl('')) - filename = url.path() - if Utilities.isWindowsPlatform(): - if filename.startswith("/"): - filename = filename[1:] - if qVersion() >= "5.0.0": - ver = url.query() - else: - ver = bytes(url.encodedQuery()).decode() - v1 = ver.split('_')[0] - v2 = ver.split('_')[1] - if not v1 or not v2: - return - try: - v1 = int(v1) - v2 = int(v2) - except ValueError: - return - self.contents.scrollToAnchor(ver) - - if self.sbsCheckBox.isEnabled() and self.sbsCheckBox.isChecked(): - self.vcs.svnSbsDiff(filename, revisions=(v1, v2)) - else: - if self.diff is None: - from .SvnDiffDialog import SvnDiffDialog - self.diff = SvnDiffDialog(self.vcs) - self.diff.show() - self.diff.start(filename, [v1, v2], pegRev=self.__pegRev) - - def __showError(self, msg): - """ - Private slot to show an error message. - - @param msg error message to show (string) - """ - self.errorGroup.show() - self.errors.insertPlainText(msg) - self.errors.ensureCursorVisible()
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui --- a/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui Fri Jan 27 19:18:52 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,97 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>SvnLogDialog</class> - <widget class="QWidget" name="SvnLogDialog"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>751</width> - <height>649</height> - </rect> - </property> - <property name="windowTitle"> - <string>Subversion Log</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QGroupBox" name="contentsGroup"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>4</verstretch> - </sizepolicy> - </property> - <property name="title"> - <string>Log</string> - </property> - <layout class="QVBoxLayout"> - <item> - <widget class="QTextBrowser" name="contents"> - <property name="whatsThis"> - <string><b>Subversion Log</b><p>This shows the output of the svn log command. By clicking on the links you may show the difference between versions.</p></string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QCheckBox" name="sbsCheckBox"> - <property name="toolTip"> - <string>Select to show differences side-by-side</string> - </property> - <property name="text"> - <string>Show differences side-by-side</string> - </property> - </widget> - </item> - <item> - <widget class="QGroupBox" name="errorGroup"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>1</verstretch> - </sizepolicy> - </property> - <property name="title"> - <string>Errors</string> - </property> - <layout class="QVBoxLayout"> - <item> - <widget class="QTextEdit" name="errors"> - <property name="whatsThis"> - <string><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></string> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="acceptRichText"> - <bool>false</bool> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> - </property> - </widget> - </item> - </layout> - </widget> - <tabstops> - <tabstop>contents</tabstop> - <tabstop>sbsCheckBox</tabstop> - <tabstop>errors</tabstop> - <tabstop>buttonBox</tabstop> - </tabstops> - <resources/> - <connections/> -</ui>
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsPySvn/subversion.py --- a/Plugins/VcsPlugins/vcsPySvn/subversion.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py Fri Feb 03 19:20:59 2017 +0100 @@ -967,27 +967,6 @@ project.removeFile(name) return res - def vcsLog(self, name): - """ - Public method used to view the log of a file/directory from the - Subversion repository. - - @param name file/directory name to show the log of (string) - """ - isFile = os.path.isfile(name) - noEntries, ok = QInputDialog.getInt( - None, - self.tr("Subversion Log"), - self.tr("Select number of entries to show."), - self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1) - if ok: - from .SvnLogDialog import SvnLogDialog - self.log = SvnLogDialog(self, isFile=isFile) - self.log.show() - self.log.raise_() - QApplication.processEvents() - self.log.start(name, noEntries) - def vcsDiff(self, name): """ Public method used to view the difference of a file/directory to the
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py --- a/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Fri Feb 03 19:20:59 2017 +0100 @@ -252,10 +252,6 @@ menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsLog.png"), - self.tr('Show log'), self._VCSLog) - self.vcsMenuActions.append(act) - act = menu.addAction( - UI.PixmapCache.getIcon("vcsLog.png"), self.tr('Show log browser'), self._VCSLogBrowser) self.vcsMenuActions.append(act) menu.addSeparator() @@ -565,10 +561,6 @@ menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsLog.png"), - self.tr('Show log'), self._VCSLog) - self.vcsDirMenuActions.append(act) - act = menu.addAction( - UI.PixmapCache.getIcon("vcsLog.png"), self.tr('Show log browser'), self._VCSLogBrowser) self.vcsDirMenuActions.append(act) menu.addSeparator()
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py --- a/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Fri Feb 03 19:20:59 2017 +0100 @@ -96,21 +96,6 @@ self.vcsCommitAct.triggered.connect(self._vcsCommit) self.actions.append(self.vcsCommitAct) - self.vcsLogAct = E5Action( - self.tr('Show log'), - UI.PixmapCache.getIcon("vcsLog.png"), - self.tr('Show &log'), - 0, 0, self, 'subversion_log') - self.vcsLogAct.setStatusTip(self.tr( - 'Show the log of the local project' - )) - self.vcsLogAct.setWhatsThis(self.tr( - """<b>Show log</b>""" - """<p>This shows the log of the local project.</p>""" - )) - self.vcsLogAct.triggered.connect(self._vcsLog) - self.actions.append(self.vcsLogAct) - self.svnLogBrowserAct = E5Action( self.tr('Show log browser'), UI.PixmapCache.getIcon("vcsLog.png"), @@ -511,7 +496,6 @@ else: menu.addAction(self.svnListAct) menu.addSeparator() - menu.addAction(self.vcsLogAct) menu.addAction(self.svnLogBrowserAct) menu.addSeparator() menu.addAction(self.vcsStatusAct) @@ -572,7 +556,6 @@ toolbarManager.addToolBar(self.__toolbar, title) toolbarManager.addAction(self.vcsUpdateAct, title) toolbarManager.addAction(self.vcsCommitAct, title) - toolbarManager.addAction(self.vcsLogAct, title) toolbarManager.addAction(self.svnExtDiffAct, title) toolbarManager.addAction(self.svnUrlDiffAct, title) toolbarManager.addAction(self.svnChangeListsAct, title)
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py --- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Fri Feb 03 19:20:59 2017 +0100 @@ -26,6 +26,7 @@ from .Ui_SvnLogBrowserDialog import Ui_SvnLogBrowserDialog import Preferences +import UI.PixmapCache class SvnLogBrowserDialog(QWidget, Ui_SvnLogBrowserDialog): @@ -47,6 +48,9 @@ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) + self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png")) + self.filesTree.headerItem().setText(self.filesTree.columnCount(), "") self.filesTree.header().setSortIndicator(0, Qt.AscendingOrder) @@ -92,6 +96,26 @@ 'R': self.tr('Replaced'), } self.intercept = False + + self.__logTreeNormalFont = self.logTree.font() + self.__logTreeNormalFont.setBold(False) + self.__logTreeBoldFont = self.logTree.font() + self.__logTreeBoldFont.setBold(True) + + self.__finishCallbacks = [] + + def __addFinishCallback(self, callback): + """ + Private method to add a method to be called once the process finished. + + The callback methods are invoke in a FIFO style and are consumed. If + a callback method needs to be called again, it must be added again. + + @param callback callback method + @type function + """ + if callback not in self.__finishCallbacks: + self.__finishCallbacks.append(callback) def __initData(self): """ @@ -349,6 +373,9 @@ self.inputGroup.setEnabled(False) self.inputGroup.hide() + + while self.__finishCallbacks: + self.__finishCallbacks.pop(0)() def __processBuffer(self): """ @@ -366,7 +393,7 @@ elif self.rx_rev2.exactMatch(s): log["revision"] = self.rx_rev2.cap(1) log["author"] = self.rx_rev2.cap(2) - log["date"] = self.rx_rev2.cap(3) + log["date"] = " ".join(self.rx_rev2.cap(3).split()[:2]) # number of lines is ignored elif self.rx_flags1.exactMatch(s): changedPaths.append({ @@ -519,6 +546,19 @@ self.diffPreviousButton.setEnabled( current != self.logTree.topLevelItem( self.logTree.topLevelItemCount() - 1)) + + # Highlight the current entry using a bold font + for col in range(self.logTree.columnCount()): + current and current.setFont(col, self.__logTreeBoldFont) + previous and previous.setFont(col, self.__logTreeNormalFont) + + # set the state of the up and down buttons + self.upButton.setEnabled( + current is not None and + self.logTree.indexOfTopLevelItem(current) > 0) + self.downButton.setEnabled( + current is not None and + int(current.text(0)) > 1) @pyqtSlot() def on_logTree_itemSelectionChanged(self): @@ -656,6 +696,28 @@ self.nextButton.setEnabled(True) self.limitSpinBox.setEnabled(True) + @pyqtSlot() + def on_upButton_clicked(self): + """ + Private slot to move the current item up one entry. + """ + itm = self.logTree.itemAbove(self.logTree.currentItem()) + if itm: + self.logTree.setCurrentItem(itm) + + @pyqtSlot() + def on_downButton_clicked(self): + """ + Private slot to move the current item down one entry. + """ + itm = self.logTree.itemBelow(self.logTree.currentItem()) + if itm: + self.logTree.setCurrentItem(itm) + else: + # load the next bunch and try again + self.__addFinishCallback(self.on_downButton_clicked) + self.on_nextButton_clicked() + def on_passwordCheckBox_toggled(self, isOn): """ Private slot to handle the password checkbox toggled.
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui --- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui Fri Feb 03 19:20:59 2017 +0100 @@ -236,6 +236,26 @@ </widget> </item> <item row="0" column="4"> + <widget class="QToolButton" name="upButton"> + <property name="toolTip"> + <string>Press to move up in the log list</string> + </property> + <property name="autoRepeat"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="5"> + <widget class="QToolButton" name="downButton"> + <property name="toolTip"> + <string>Press to move down in the log list</string> + </property> + <property name="autoRepeat"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="6"> <widget class="QPushButton" name="diffPreviousButton"> <property name="toolTip"> <string>Press to generate a diff to the previous revision</string> @@ -245,7 +265,7 @@ </property> </widget> </item> - <item row="0" column="5"> + <item row="0" column="7"> <widget class="QPushButton" name="diffRevisionsButton"> <property name="toolTip"> <string>Press to compare two revisions</string> @@ -255,7 +275,7 @@ </property> </widget> </item> - <item row="0" column="6"> + <item row="0" column="8"> <spacer> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -268,7 +288,7 @@ </property> </spacer> </item> - <item row="1" column="4" colspan="3"> + <item row="1" column="4" colspan="5"> <widget class="QCheckBox" name="sbsCheckBox"> <property name="toolTip"> <string>Select to show differences side-by-side</string> @@ -396,6 +416,8 @@ <tabstop>nextButton</tabstop> <tabstop>limitSpinBox</tabstop> <tabstop>stopCheckBox</tabstop> + <tabstop>upButton</tabstop> + <tabstop>downButton</tabstop> <tabstop>diffPreviousButton</tabstop> <tabstop>diffRevisionsButton</tabstop> <tabstop>sbsCheckBox</tabstop> @@ -403,7 +425,6 @@ <tabstop>input</tabstop> <tabstop>passwordCheckBox</tabstop> <tabstop>sendButton</tabstop> - <tabstop>buttonBox</tabstop> </tabstops> <resources/> <connections/>
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py --- a/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,348 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2003 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing a dialog to show the output of the svn log command process. -""" - -from __future__ import unicode_literals -try: - str = unicode -except NameError: - pass - -import os - -from PyQt5.QtCore import QTimer, QProcess, QRegExp, QUrl, pyqtSlot, qVersion, \ - QByteArray -from PyQt5.QtGui import QTextCursor -from PyQt5.QtWidgets import QWidget, QLineEdit, QApplication, QDialogButtonBox - -from E5Gui import E5MessageBox - -from .Ui_SvnLogDialog import Ui_SvnLogDialog - -import Utilities -import Preferences - - -class SvnLogDialog(QWidget, Ui_SvnLogDialog): - """ - Class implementing a dialog to show the output of the svn log command - process. - - The dialog is nonmodal. Clicking a link in the upper text pane shows - a diff of the versions. - """ - def __init__(self, vcs, isFile=False, parent=None): - """ - Constructor - - @param vcs reference to the vcs object - @param isFile flag indicating log for a file is to be shown (boolean) - @param parent parent widget (QWidget) - """ - super(SvnLogDialog, self).__init__(parent) - self.setupUi(self) - - self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) - - self.process = QProcess() - self.vcs = vcs - - self.contents.setHtml( - self.tr('<b>Processing your request, please wait...</b>')) - - self.process.finished.connect(self.__procFinished) - self.process.readyReadStandardOutput.connect(self.__readStdout) - self.process.readyReadStandardError.connect(self.__readStderr) - - self.contents.anchorClicked.connect(self.__sourceChanged) - - self.rx_sep = QRegExp('\\-+\\s*') - self.rx_sep2 = QRegExp('=+\\s*') - self.rx_rev = QRegExp( - 'rev ([0-9]+): ([^|]*) \| ([^|]*) \| ([0-9]+) .*') - # "rev" followed by one or more decimals followed by a colon followed - # anything up to " | " (twice) followed by one or more decimals - # followed by anything - self.rx_rev2 = QRegExp( - 'r([0-9]+) \| ([^|]*) \| ([^|]*) \| ([0-9]+) .*') - # "r" followed by one or more decimals followed by " | " followed - # anything up to " | " (twice) followed by one or more decimals - # followed by anything - self.rx_flags = QRegExp(' ([ADM])( .*)\\s*') - # three blanks followed by A or D or M - self.rx_changed = QRegExp('Changed .*\\s*') - - self.flags = { - 'A': self.tr('Added'), - 'D': self.tr('Deleted'), - 'M': self.tr('Modified') - } - - self.revisions = [] # stack of remembered revisions - self.revString = self.tr('revision') - - self.buf = [] # buffer for stdout - self.diff = None - - self.sbsCheckBox.setEnabled(isFile) - self.sbsCheckBox.setVisible(isFile) - - def closeEvent(self, e): - """ - Protected slot implementing a close event handler. - - @param e close event (QCloseEvent) - """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) - - e.accept() - - def start(self, fn, noEntries=0): - """ - Public slot to start the cvs log command. - - @param fn filename to show the log for (string) - @param noEntries number of entries to show (integer) - """ - self.errorGroup.hide() - QApplication.processEvents() - - self.intercept = False - self.filename = fn - self.dname, self.fname = self.vcs.splitPath(fn) - - self.process.kill() - - args = [] - args.append('log') - self.vcs.addArguments(args, self.vcs.options['global']) - self.vcs.addArguments(args, self.vcs.options['log']) - if noEntries: - args.append('--limit') - args.append(str(noEntries)) - self.activateWindow() - self.raise_() - args.append(self.fname) - - self.process.setWorkingDirectory(self.dname) - - self.process.start('svn', args) - procStarted = self.process.waitForStarted(5000) - if not procStarted: - self.inputGroup.setEnabled(False) - E5MessageBox.critical( - self, - self.tr('Process Generation Error'), - self.tr( - 'The process {0} could not be started. ' - 'Ensure, that it is in the search path.' - ).format('svn')) - - def __procFinished(self, exitCode, exitStatus): - """ - Private slot connected to the finished signal. - - @param exitCode exit code of the process (integer) - @param exitStatus exit status of the process (QProcess.ExitStatus) - """ - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - - self.contents.clear() - - lvers = 1 - for s in self.buf: - rev_match = False - if self.rx_rev.exactMatch(s): - ver = self.rx_rev.cap(1) - author = self.rx_rev.cap(2) - date = self.rx_rev.cap(3) - # number of lines is ignored - rev_match = True - elif self.rx_rev2.exactMatch(s): - ver = self.rx_rev2.cap(1) - author = self.rx_rev2.cap(2) - date = self.rx_rev2.cap(3) - # number of lines is ignored - rev_match = True - - if rev_match: - dstr = '<b>{0} {1}</b>'.format(self.revString, ver) - try: - lv = self.revisions[lvers] - lvers += 1 - url = QUrl() - url.setScheme("file") - url.setPath(self.filename) - if qVersion() >= "5.0.0": - query = lv + '_' + ver - url.setQuery(query) - else: - query = QByteArray() - query.append(lv).append('_').append(ver) - url.setEncodedQuery(query) - dstr += ' [<a href="{0}" name="{1}">{2}</a>]'.format( - url.toString(), query, - self.tr('diff to {0}').format(lv), - ) - except IndexError: - pass - dstr += '<br />\n' - self.contents.insertHtml(dstr) - - dstr = self.tr('<i>author: {0}</i><br />\n').format(author) - self.contents.insertHtml(dstr) - - dstr = self.tr('<i>date: {0}</i><br />\n').format(date) - self.contents.insertHtml(dstr) - - elif self.rx_sep.exactMatch(s) or self.rx_sep2.exactMatch(s): - self.contents.insertHtml('<hr />\n') - - elif self.rx_flags.exactMatch(s): - dstr = self.flags[self.rx_flags.cap(1)] - dstr += self.rx_flags.cap(2) - dstr += '<br />\n' - self.contents.insertHtml(dstr) - - elif self.rx_changed.exactMatch(s): - dstr = '<br />{0}<br />\n'.format(s) - self.contents.insertHtml(dstr) - - else: - if s == "": - s = self.contents.insertHtml('<br />\n') - else: - self.contents.insertHtml(Utilities.html_encode(s)) - self.contents.insertHtml('<br />\n') - - tc = self.contents.textCursor() - tc.movePosition(QTextCursor.Start) - self.contents.setTextCursor(tc) - self.contents.ensureCursorVisible() - - def __readStdout(self): - """ - Private slot to handle the readyReadStandardOutput signal. - - It reads the output of the process and inserts it into a buffer. - """ - self.process.setReadChannel(QProcess.StandardOutput) - - while self.process.canReadLine(): - line = str(self.process.readLine(), - Preferences.getSystem("IOEncoding"), - 'replace') - self.buf.append(line) - if self.rx_rev.exactMatch(line): - ver = self.rx_rev.cap(1) - # save revision number for later use - self.revisions.append(ver) - elif self.rx_rev2.exactMatch(line): - ver = self.rx_rev2.cap(1) - # save revision number for later use - self.revisions.append(ver) - - def __readStderr(self): - """ - Private slot to handle the readyReadStandardError signal. - - It reads the error output of the process and inserts it into the - error pane. - """ - if self.process is not None: - self.errorGroup.show() - s = str(self.process.readAllStandardError(), - Preferences.getSystem("IOEncoding"), - 'replace') - self.errors.insertPlainText(s) - self.errors.ensureCursorVisible() - - def __sourceChanged(self, url): - """ - Private slot to handle the sourceChanged signal of the contents pane. - - @param url the url that was clicked (QUrl) - """ - self.contents.setSource(QUrl('')) - filename = url.path() - if Utilities.isWindowsPlatform(): - if filename.startswith("/"): - filename = filename[1:] - if qVersion() >= "5.0.0": - ver = url.query() - else: - ver = bytes(url.encodedQuery()).decode() - v1 = ver.split('_')[0] - v2 = ver.split('_')[1] - if v1 == "" or v2 == "": - return - self.contents.scrollToAnchor(ver) - - if self.sbsCheckBox.isEnabled() and self.sbsCheckBox.isChecked(): - self.vcs.svnSbsDiff(filename, revisions=(v1, v2)) - else: - if self.diff is None: - from .SvnDiffDialog import SvnDiffDialog - self.diff = SvnDiffDialog(self.vcs) - self.diff.show() - self.diff.start(filename, [v1, v2]) - - def on_passwordCheckBox_toggled(self, isOn): - """ - Private slot to handle the password checkbox toggled. - - @param isOn flag indicating the status of the check box (boolean) - """ - if isOn: - self.input.setEchoMode(QLineEdit.Password) - else: - self.input.setEchoMode(QLineEdit.Normal) - - @pyqtSlot() - def on_sendButton_clicked(self): - """ - Private slot to send the input to the subversion process. - """ - input = self.input.text() - input += os.linesep - - if self.passwordCheckBox.isChecked(): - self.errors.insertPlainText(os.linesep) - self.errors.ensureCursorVisible() - else: - self.errors.insertPlainText(input) - self.errors.ensureCursorVisible() - - self.process.write(input) - - self.passwordCheckBox.setChecked(False) - self.input.clear() - - def on_input_returnPressed(self): - """ - Private slot to handle the press of the return key in the input field. - """ - self.intercept = True - self.on_sendButton_clicked() - - def keyPressEvent(self, evt): - """ - Protected slot to handle a key press event. - - @param evt the key press event (QKeyEvent) - """ - if self.intercept: - self.intercept = False - evt.accept() - return - super(SvnLogDialog, self).keyPressEvent(evt)
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui --- a/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui Fri Jan 27 19:18:52 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,175 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>SvnLogDialog</class> - <widget class="QWidget" name="SvnLogDialog"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>751</width> - <height>649</height> - </rect> - </property> - <property name="windowTitle"> - <string>Subversion Log</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QGroupBox" name="contentsGroup"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>3</verstretch> - </sizepolicy> - </property> - <property name="title"> - <string>Log</string> - </property> - <layout class="QVBoxLayout"> - <item> - <widget class="QTextBrowser" name="contents"> - <property name="whatsThis"> - <string><b>Subversion Log</b><p>This shows the output of the svn log command. By clicking on the links you may show the difference between versions.</p></string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QCheckBox" name="sbsCheckBox"> - <property name="toolTip"> - <string>Select to show differences side-by-side</string> - </property> - <property name="text"> - <string>Show differences side-by-side</string> - </property> - </widget> - </item> - <item> - <widget class="QGroupBox" name="errorGroup"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>1</verstretch> - </sizepolicy> - </property> - <property name="title"> - <string>Errors</string> - </property> - <layout class="QVBoxLayout"> - <item> - <widget class="QTextEdit" name="errors"> - <property name="whatsThis"> - <string><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></string> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="acceptRichText"> - <bool>false</bool> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="inputGroup"> - <property name="title"> - <string>Input</string> - </property> - <layout class="QGridLayout"> - <item row="1" column="1"> - <spacer> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>327</width> - <height>29</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="2"> - <widget class="QPushButton" name="sendButton"> - <property name="toolTip"> - <string>Press to send the input to the subversion process</string> - </property> - <property name="text"> - <string>&Send</string> - </property> - <property name="shortcut"> - <string>Alt+S</string> - </property> - </widget> - </item> - <item row="0" column="0" colspan="3"> - <widget class="QLineEdit" name="input"> - <property name="toolTip"> - <string>Enter data to be sent to the subversion process</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="passwordCheckBox"> - <property name="toolTip"> - <string>Select to switch the input field to password mode</string> - </property> - <property name="text"> - <string>&Password Mode</string> - </property> - <property name="shortcut"> - <string>Alt+P</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Close</set> - </property> - </widget> - </item> - </layout> - </widget> - <tabstops> - <tabstop>contents</tabstop> - <tabstop>sbsCheckBox</tabstop> - <tabstop>errors</tabstop> - <tabstop>input</tabstop> - <tabstop>passwordCheckBox</tabstop> - <tabstop>sendButton</tabstop> - <tabstop>buttonBox</tabstop> - </tabstops> - <resources/> - <connections> - <connection> - <sender>buttonBox</sender> - <signal>rejected()</signal> - <receiver>SvnLogDialog</receiver> - <slot>close()</slot> - <hints> - <hint type="sourcelabel"> - <x>262</x> - <y>624</y> - </hint> - <hint type="destinationlabel"> - <x>271</x> - <y>647</y> - </hint> - </hints> - </connection> - </connections> -</ui>
diff -r 852016bbdedb -r c307358a2ecc Plugins/VcsPlugins/vcsSubversion/subversion.py --- a/Plugins/VcsPlugins/vcsSubversion/subversion.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py Fri Feb 03 19:20:59 2017 +0100 @@ -887,26 +887,6 @@ project.removeFile(name) return res - def vcsLog(self, name): - """ - Public method used to view the log of a file/directory from the - Subversion repository. - - @param name file/directory name to show the log of (string) - """ - isFile = os.path.isfile(name) - noEntries, ok = QInputDialog.getInt( - None, - self.tr("Subversion Log"), - self.tr("Select number of entries to show."), - self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1) - if ok: - from .SvnLogDialog import SvnLogDialog - self.log = SvnLogDialog(self, isFile=isFile) - self.log.show() - self.log.raise_() - self.log.start(name, noEntries) - def vcsDiff(self, name): """ Public method used to view the difference of a file/directory to the
diff -r 852016bbdedb -r c307358a2ecc Preferences/ConfigurationPages/ApplicationPage.py --- a/Preferences/ConfigurationPages/ApplicationPage.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Preferences/ConfigurationPages/ApplicationPage.py Fri Feb 03 19:20:59 2017 +0100 @@ -96,7 +96,7 @@ openOnStartup = 4 Preferences.setUI("OpenOnStartup", openOnStartup) Preferences.setUI("OpenCrashSessionOnStartup", - self.openCrashSessionCheckBox.isChecked()) + self.openCrashSessionCheckBox.isChecked()) if self.noCheckRadioButton.isChecked(): period = 0
diff -r 852016bbdedb -r c307358a2ecc Preferences/ConfigurationPages/EditorAPIsPage.py --- a/Preferences/ConfigurationPages/EditorAPIsPage.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Preferences/ConfigurationPages/EditorAPIsPage.py Fri Feb 03 19:20:59 2017 +0100 @@ -55,7 +55,9 @@ apiLanguages = sorted( [''] + list(QScintilla.Lexers.getSupportedApiLanguages())) for lang in apiLanguages: - self.apiLanguageComboBox.addItem(lang) + self.apiLanguageComboBox.addItem( + QScintilla.Lexers.getLanguageIcon(lang, False), + lang) apiProjectTypes = sorted( [("", "")] + [(trans, ptype) for ptype, trans in
diff -r 852016bbdedb -r c307358a2ecc Preferences/ConfigurationPages/EditorHighlightersPage.py --- a/Preferences/ConfigurationPages/EditorHighlightersPage.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Preferences/ConfigurationPages/EditorHighlightersPage.py Fri Feb 03 19:20:59 2017 +0100 @@ -50,9 +50,13 @@ except AttributeError: self.extsep = "." + import QScintilla.Lexers self.extras = ["-----------", self.tr("Alternative")] languages = [''] + sorted(lexers.keys()) + self.extras - self.editorLexerCombo.addItems(languages) + for lang in languages: + self.editorLexerCombo.addItem( + QScintilla.Lexers.getLanguageIcon(lang, False), + lang) pygmentsLexers = [''] + sorted([l[0] for l in get_all_lexers()]) self.pygmentsLexerCombo.addItems(pygmentsLexers)
diff -r 852016bbdedb -r c307358a2ecc Preferences/ConfigurationPages/EditorHighlightingStylesPage.py --- a/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Fri Feb 03 19:20:59 2017 +0100 @@ -84,8 +84,12 @@ self.lexers = lexers # set initial values + import QScintilla.Lexers languages = sorted([''] + list(self.lexers.keys())) - self.lexerLanguageComboBox.addItems(languages) + for language in languages: + self.lexerLanguageComboBox.addItem( + QScintilla.Lexers.getLanguageIcon(language, False), + language) self.on_lexerLanguageComboBox_activated("") def save(self):
diff -r 852016bbdedb -r c307358a2ecc Preferences/ConfigurationPages/EditorKeywordsPage.py --- a/Preferences/ConfigurationPages/EditorKeywordsPage.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Preferences/ConfigurationPages/EditorKeywordsPage.py Fri Feb 03 19:20:59 2017 +0100 @@ -57,7 +57,9 @@ keywords.append(kw) self.__keywords[lang] = keywords self.__maxKeywordSets[lang] = lex.maximumKeywordSet() - self.languageCombo.addItem(lang) + self.languageCombo.addItem( + QScintilla.Lexers.getLanguageIcon(lang, False), + lang) self.currentLanguage = '' self.currentSet = 1
diff -r 852016bbdedb -r c307358a2ecc Preferences/ConfigurationPages/EditorPropertiesPage.py --- a/Preferences/ConfigurationPages/EditorPropertiesPage.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Preferences/ConfigurationPages/EditorPropertiesPage.py Fri Feb 03 19:20:59 2017 +0100 @@ -57,33 +57,19 @@ Preferences.getEditor("CppCaseInsensitiveKeywords")) self.cppDollarAllowedCheckBox.setChecked( Preferences.getEditor("CppDollarsAllowed")) - if QSCINTILLA_VERSION() >= 0x020500: - self.cppStylePreprocessorCheckBox.setChecked( - Preferences.getEditor("CppStylePreprocessor")) - else: - self.cppStylePreprocessorCheckBox.setEnabled(False) - if QSCINTILLA_VERSION() >= 0x020600: - self.cppHighlightTripleQuotedCheckBox.setChecked( - Preferences.getEditor("CppHighlightTripleQuotedStrings")) - else: - self.cppHighlightTripleQuotedCheckBox.setEnabled(False) - if QSCINTILLA_VERSION() >= 0x020700: - self.cppHighlightHashQuotedCheckBox.setChecked( - Preferences.getEditor("CppHighlightHashQuotedStrings")) - else: - self.cppHighlightHashQuotedCheckBox.setEnabled(False) - if QSCINTILLA_VERSION() >= 0x020900: - self.cppHighlightBackQuotedCheckBox.setChecked( - Preferences.getEditor("CppHighlightBackQuotedStrings")) - self.cppHighlightEsacepSequencesCheckBox.setChecked( - Preferences.getEditor("CppHighlightEscapeSequences")) - self.cppVerbatimStringEscapeAllowedCheckBox.setChecked( - Preferences.getEditor( - "CppVerbatimStringEscapeSequencesAllowed")) - else: - self.cppHighlightBackQuotedCheckBox.setEnabled(False) - self.cppHighlightEsacepSequencesCheckBox.setEnabled(False) - self.cppVerbatimStringEscapeAllowedCheckBox.setEnabled(False) + self.cppStylePreprocessorCheckBox.setChecked( + Preferences.getEditor("CppStylePreprocessor")) + self.cppHighlightTripleQuotedCheckBox.setChecked( + Preferences.getEditor("CppHighlightTripleQuotedStrings")) + self.cppHighlightHashQuotedCheckBox.setChecked( + Preferences.getEditor("CppHighlightHashQuotedStrings")) + self.cppHighlightBackQuotedCheckBox.setChecked( + Preferences.getEditor("CppHighlightBackQuotedStrings")) + self.cppHighlightEsacepSequencesCheckBox.setChecked( + Preferences.getEditor("CppHighlightEscapeSequences")) + self.cppVerbatimStringEscapeAllowedCheckBox.setChecked( + Preferences.getEditor( + "CppVerbatimStringEscapeSequencesAllowed")) # CMake self.cmakeFoldAtElseCheckBox.setChecked( @@ -103,17 +89,12 @@ # CSS self.foldCssCommentCheckBox.setChecked( Preferences.getEditor("CssFoldComment")) - if QSCINTILLA_VERSION() >= 0x020700: - self.cssHssCheckBox.setChecked( - Preferences.getEditor("CssHssSupport")) - self.cssLessCheckBox.setChecked( - Preferences.getEditor("CssLessSupport")) - self.cssSassyCheckBox.setChecked( - Preferences.getEditor("CssSassySupport")) - else: - self.cssHssCheckBox.setEnabled(False) - self.cssLessCheckBox.setEnabled(False) - self.cssSassyCheckBox.setEnabled(False) + self.cssHssCheckBox.setChecked( + Preferences.getEditor("CssHssSupport")) + self.cssLessCheckBox.setChecked( + Preferences.getEditor("CssLessSupport")) + self.cssSassyCheckBox.setChecked( + Preferences.getEditor("CssSassySupport")) # D self.foldDCommentCheckBox.setChecked( @@ -141,29 +122,28 @@ Preferences.getEditor("HtmlFoldScriptComments")) self.foldHtmlScriptHereDocsCheckBox.setChecked( Preferences.getEditor("HtmlFoldScriptHeredocs")) - if QSCINTILLA_VERSION() >= 0x020500: - self.htmlDjangoCheckBox.setChecked( - Preferences.getEditor("HtmlDjangoTemplates")) - self.htmlMakoCheckBox.setChecked( - Preferences.getEditor("HtmlMakoTemplates")) + self.htmlDjangoCheckBox.setChecked( + Preferences.getEditor("HtmlDjangoTemplates")) + self.htmlMakoCheckBox.setChecked( + Preferences.getEditor("HtmlMakoTemplates")) + + # JSON + if "JSON" in self.languages: + self.jsonHighlightCommentsCheckBox.setChecked( + Preferences.getEditor("JSONHightlightComments")) + self.jsonHighlightEscapeCheckBox.setChecked( + Preferences.getEditor("JSONHighlightEscapeSequences")) else: - self.htmlDjangoCheckBox.setEnabled(False) - self.htmlMakoCheckBox.setEnabled(False) + self.jsonGroup.setEnabled(False) # Pascal - if "Pascal" in self.languages: - self.pascalGroup.setEnabled(True) - self.foldPascalCommentCheckBox.setChecked( - Preferences.getEditor("PascalFoldComment")) - self.foldPascalPreprocessorCheckBox.setChecked( - Preferences.getEditor("PascalFoldPreprocessor")) - if QSCINTILLA_VERSION() >= 0x020400: - self.pascalSmartHighlightingCheckBox.setChecked( - Preferences.getEditor("PascalSmartHighlighting")) - else: - self.pascalSmartHighlightingCheckBox.setEnabled(False) - else: - self.pascalGroup.setEnabled(False) + self.pascalGroup.setEnabled(True) + self.foldPascalCommentCheckBox.setChecked( + Preferences.getEditor("PascalFoldComment")) + self.foldPascalPreprocessorCheckBox.setChecked( + Preferences.getEditor("PascalFoldPreprocessor")) + self.pascalSmartHighlightingCheckBox.setChecked( + Preferences.getEditor("PascalSmartHighlighting")) # Perl self.foldPerlCommentCheckBox.setChecked( @@ -172,23 +152,17 @@ Preferences.getEditor("PerlFoldPackages")) self.foldPerlPODBlocksCheckBox.setChecked( Preferences.getEditor("PerlFoldPODBlocks")) - if QSCINTILLA_VERSION() >= 0x020600: - self.foldPerlAtElseCheckBox.setChecked( - Preferences.getEditor("PerlFoldAtElse")) - else: - self.foldPerlAtElseCheckBox.setEnabled(False) + self.foldPerlAtElseCheckBox.setChecked( + Preferences.getEditor("PerlFoldAtElse")) # PostScript - if "PostScript" in self.languages: - self.postscriptGroup.setEnabled(True) - self.psFoldAtElseCheckBox.setChecked( - Preferences.getEditor("PostScriptFoldAtElse")) - self.psMarkTokensCheckBox.setChecked( - Preferences.getEditor("PostScriptTokenize")) - self.psLevelSpinBox.setValue( - Preferences.getEditor("PostScriptLevel")) - else: - self.postscriptGroup.setEnabled(False) + self.postscriptGroup.setEnabled(True) + self.psFoldAtElseCheckBox.setChecked( + Preferences.getEditor("PostScriptFoldAtElse")) + self.psMarkTokensCheckBox.setChecked( + Preferences.getEditor("PostScriptTokenize")) + self.psLevelSpinBox.setValue( + Preferences.getEditor("PostScriptLevel")) # Povray self.foldPovrayCommentCheckBox.setChecked( @@ -197,11 +171,8 @@ Preferences.getEditor("PovFoldDirectives")) # Properties - if QSCINTILLA_VERSION() >= 0x020500: - self.propertiesInitialSpacesCheckBox.setChecked( - Preferences.getEditor("PropertiesInitialSpaces")) - else: - self.propertiesInitialSpacesCheckBox.setEnabled(False) + self.propertiesInitialSpacesCheckBox.setChecked( + Preferences.getEditor("PropertiesInitialSpaces")) # Python self.pythonBadIndentationComboBox.addItems([ @@ -225,69 +196,44 @@ Preferences.getEditor("PythonAllowV3Binary")) self.pythonV3BytesAllowedCheckBox.setChecked( Preferences.getEditor("PythonAllowV3Bytes")) - if QSCINTILLA_VERSION() >= 0x020500: - self.foldPythonQuotesCheckBox.setChecked( - Preferences.getEditor("PythonFoldQuotes")) - self.pythonStringsOverNewlineCheckBox.setChecked( - Preferences.getEditor("PythonStringsOverNewLineAllowed")) - else: - self.foldPythonQuotesCheckBox.setEnabled(False) - self.pythonStringsOverNewlineCheckBox.setEnabled(False) - if QSCINTILLA_VERSION() >= 0x020600: - self.pythonHighlightSubidentifierCheckBox.setChecked( - Preferences.getEditor("PythonHighlightSubidentifier")) - else: - self.pythonHighlightSubidentifierCheckBox.setEnabled(False) + self.foldPythonQuotesCheckBox.setChecked( + Preferences.getEditor("PythonFoldQuotes")) + self.pythonStringsOverNewlineCheckBox.setChecked( + Preferences.getEditor("PythonStringsOverNewLineAllowed")) + self.pythonHighlightSubidentifierCheckBox.setChecked( + Preferences.getEditor("PythonHighlightSubidentifier")) # Ruby - if QSCINTILLA_VERSION() >= 0x020500: - self.foldRubyCommentCheckBox.setChecked( - Preferences.getEditor("RubyFoldComment")) - else: - self.foldRubyCommentCheckBox.setEnabled(False) + self.foldRubyCommentCheckBox.setChecked( + Preferences.getEditor("RubyFoldComment")) # SQL self.foldSqlCommentCheckBox.setChecked( Preferences.getEditor("SqlFoldComment")) self.sqlBackslashEscapesCheckBox.setChecked( Preferences.getEditor("SqlBackslashEscapes")) - if QSCINTILLA_VERSION() >= 0x020500: - self.sqlFoldAtElseCheckBox.setChecked( - Preferences.getEditor("SqlFoldAtElse")) - self.sqlFoldOnlyBeginCheckBox.setChecked( - Preferences.getEditor("SqlFoldOnlyBegin")) - self.sqlDottedWordsCheckBox.setChecked( - Preferences.getEditor("SqlDottedWords")) - self.sqlHashCommentsCheckBox.setChecked( - Preferences.getEditor("SqlHashComments")) - self.sqlQuotedIdentifiersCheckBox.setChecked( - Preferences.getEditor("SqlQuotedIdentifiers")) - else: - self.sqlFoldAtElseCheckBox.setEnabled(False) - self.sqlFoldOnlyBeginCheckBox.setEnabled(False) - self.sqlDottedWordsCheckBox.setEnabled(False) - self.sqlHashCommentsCheckBox.setEnabled(False) - self.sqlQuotedIdentifiersCheckBox.setEnabled(False) + self.sqlFoldAtElseCheckBox.setChecked( + Preferences.getEditor("SqlFoldAtElse")) + self.sqlFoldOnlyBeginCheckBox.setChecked( + Preferences.getEditor("SqlFoldOnlyBegin")) + self.sqlDottedWordsCheckBox.setChecked( + Preferences.getEditor("SqlDottedWords")) + self.sqlHashCommentsCheckBox.setChecked( + Preferences.getEditor("SqlHashComments")) + self.sqlQuotedIdentifiersCheckBox.setChecked( + Preferences.getEditor("SqlQuotedIdentifiers")) # TCL - if QSCINTILLA_VERSION() >= 0x020500: - self.foldTclCommentCheckBox.setChecked( - Preferences.getEditor("TclFoldComment")) - else: - self.foldTclCommentCheckBox.setEnabled(False) + self.foldTclCommentCheckBox.setChecked( + Preferences.getEditor("TclFoldComment")) # TeX - if QSCINTILLA_VERSION() >= 0x020500: - self.foldTexCommentCheckBox.setChecked( - Preferences.getEditor("TexFoldComment")) - self.texProcessCommentsCheckBox.setChecked( - Preferences.getEditor("TexProcessComments")) - self.texProcessIfCheckBox.setChecked( - Preferences.getEditor("TexProcessIf")) - else: - self.foldTexCommentCheckBox.setEnabled(False) - self.texProcessCommentsCheckBox.setEnabled(False) - self.texProcessIfCheckBox.setEnabled(False) + self.foldTexCommentCheckBox.setChecked( + Preferences.getEditor("TexFoldComment")) + self.texProcessCommentsCheckBox.setChecked( + Preferences.getEditor("TexProcessComments")) + self.texProcessIfCheckBox.setChecked( + Preferences.getEditor("TexProcessIf")) # VHDL self.vhdlFoldCommentCheckBox.setChecked( @@ -304,12 +250,9 @@ Preferences.getEditor("XMLStyleScripts")) # YAML - if "YAML" in self.languages: - self.yamlGroup.setEnabled(True) - self.foldYamlCommentCheckBox.setChecked( - Preferences.getEditor("YAMLFoldComment")) - else: - self.yamlGroup.setEnabled(False) + self.yamlGroup.setEnabled(True) + self.foldYamlCommentCheckBox.setChecked( + Preferences.getEditor("YAMLFoldComment")) def save(self): """ @@ -352,18 +295,15 @@ Preferences.setEditor( "CppDollarsAllowed", self.cppDollarAllowedCheckBox.isChecked()) - if QSCINTILLA_VERSION() >= 0x020500: - Preferences.setEditor( - "CppStylePreprocessor", - self.cppStylePreprocessorCheckBox.isChecked()) - if QSCINTILLA_VERSION() >= 0x020600: - Preferences.setEditor( - "CppHighlightTripleQuotedStrings", - self.cppHighlightTripleQuotedCheckBox.isChecked()) - if QSCINTILLA_VERSION() >= 0x020700: - Preferences.setEditor( - "CppHighlightHashQuotedStrings", - self.cppHighlightHashQuotedCheckBox.isChecked()) + Preferences.setEditor( + "CppStylePreprocessor", + self.cppStylePreprocessorCheckBox.isChecked()) + Preferences.setEditor( + "CppHighlightTripleQuotedStrings", + self.cppHighlightTripleQuotedCheckBox.isChecked()) + Preferences.setEditor( + "CppHighlightHashQuotedStrings", + self.cppHighlightHashQuotedCheckBox.isChecked()) if QSCINTILLA_VERSION() >= 0x020900: Preferences.setEditor( "CppHighlightBackQuotedStrings", @@ -396,16 +336,15 @@ Preferences.setEditor( "CssFoldComment", self.foldCssCommentCheckBox.isChecked()) - if QSCINTILLA_VERSION() >= 0x020700: - Preferences.setEditor( - "CssHssSupport", - self.cssHssCheckBox.isChecked()) - Preferences.setEditor( - "CssLessSupport", - self.cssLessCheckBox.isChecked()) - Preferences.setEditor( - "CssSassySupport", - self.cssSassyCheckBox.isChecked()) + Preferences.setEditor( + "CssHssSupport", + self.cssHssCheckBox.isChecked()) + Preferences.setEditor( + "CssLessSupport", + self.cssLessCheckBox.isChecked()) + Preferences.setEditor( + "CssSassySupport", + self.cssSassyCheckBox.isChecked()) # D Preferences.setEditor( @@ -440,25 +379,32 @@ Preferences.setEditor( "HtmlFoldScriptHeredocs", self.foldHtmlScriptHereDocsCheckBox.isChecked()) - if QSCINTILLA_VERSION() >= 0x020500: + Preferences.setEditor( + "HtmlDjangoTemplates", + self.htmlDjangoCheckBox.isChecked()) + Preferences.setEditor( + "HtmlMakoTemplates", + self.htmlMakoCheckBox.isChecked()) + + # JSON + if "JSON" in self.languages: Preferences.setEditor( - "HtmlDjangoTemplates", - self.htmlDjangoCheckBox.isChecked()) + "JSONHightlightComments", + self.jsonHighlightCommentsCheckBox.isChecked()) Preferences.setEditor( - "HtmlMakoTemplates", - self.htmlMakoCheckBox.isChecked()) + "JSONHighlightEscapeSequences", + self.jsonHighlightEscapeCheckBox.isChecked()) # Pascal - if "Pascal" in self.languages: - Preferences.setEditor( - "PascalFoldComment", - self.foldPascalCommentCheckBox.isChecked()) - Preferences.setEditor( - "PascalFoldPreprocessor", - self.foldPascalPreprocessorCheckBox.isChecked()) - Preferences.setEditor( - "PascalSmartHighlighting", - self.pascalSmartHighlightingCheckBox.isChecked()) + Preferences.setEditor( + "PascalFoldComment", + self.foldPascalCommentCheckBox.isChecked()) + Preferences.setEditor( + "PascalFoldPreprocessor", + self.foldPascalPreprocessorCheckBox.isChecked()) + Preferences.setEditor( + "PascalSmartHighlighting", + self.pascalSmartHighlightingCheckBox.isChecked()) # Perl Preferences.setEditor( @@ -470,22 +416,20 @@ Preferences.setEditor( "PerlFoldPODBlocks", self.foldPerlPODBlocksCheckBox.isChecked()) - if QSCINTILLA_VERSION() >= 0x020600: - Preferences.setEditor( - "PerlFoldAtElse", - self.foldPerlAtElseCheckBox.isChecked()) + Preferences.setEditor( + "PerlFoldAtElse", + self.foldPerlAtElseCheckBox.isChecked()) # PostScript - if "PostScript" in self.languages: - Preferences.setEditor( - "PostScriptFoldAtElse", - self.psFoldAtElseCheckBox.isChecked()) - Preferences.setEditor( - "PostScriptTokenize", - self.psMarkTokensCheckBox.isChecked()) - Preferences.setEditor( - "PostScriptLevel", - self.psLevelSpinBox.value()) + Preferences.setEditor( + "PostScriptFoldAtElse", + self.psFoldAtElseCheckBox.isChecked()) + Preferences.setEditor( + "PostScriptTokenize", + self.psMarkTokensCheckBox.isChecked()) + Preferences.setEditor( + "PostScriptLevel", + self.psLevelSpinBox.value()) # Povray Preferences.setEditor( @@ -496,10 +440,9 @@ self.foldPovrayDirectivesCheckBox.isChecked()) # Properties - if QSCINTILLA_VERSION() >= 0x020500: - Preferences.setEditor( - "PropertiesInitialSpaces", - self.propertiesInitialSpacesCheckBox.isChecked()) + Preferences.setEditor( + "PropertiesInitialSpaces", + self.propertiesInitialSpacesCheckBox.isChecked()) # Python Preferences.setEditor( @@ -523,23 +466,20 @@ Preferences.setEditor( "PythonAllowV3Bytes", self.pythonV3BytesAllowedCheckBox.isChecked()) - if QSCINTILLA_VERSION() >= 0x020500: - Preferences.setEditor( - "PythonFoldQuotes", - self.foldPythonQuotesCheckBox.isChecked()) - Preferences.setEditor( - "PythonStringsOverNewLineAllowed", - self.pythonStringsOverNewlineCheckBox.isChecked()) - if QSCINTILLA_VERSION() >= 0x020600: - Preferences.setEditor( - "PythonHighlightSubidentifier", - self.pythonHighlightSubidentifierCheckBox.isChecked()) + Preferences.setEditor( + "PythonFoldQuotes", + self.foldPythonQuotesCheckBox.isChecked()) + Preferences.setEditor( + "PythonStringsOverNewLineAllowed", + self.pythonStringsOverNewlineCheckBox.isChecked()) + Preferences.setEditor( + "PythonHighlightSubidentifier", + self.pythonHighlightSubidentifierCheckBox.isChecked()) # Ruby - if QSCINTILLA_VERSION() >= 0x020500: - Preferences.setEditor( - "RubyFoldComment", - self.foldRubyCommentCheckBox.isChecked()) + Preferences.setEditor( + "RubyFoldComment", + self.foldRubyCommentCheckBox.isChecked()) # SQL Preferences.setEditor( @@ -548,40 +488,37 @@ Preferences.setEditor( "SqlBackslashEscapes", self.sqlBackslashEscapesCheckBox.isChecked()) - if QSCINTILLA_VERSION() >= 0x020500: - Preferences.setEditor( - "SqlFoldAtElse", - self.sqlFoldAtElseCheckBox.isChecked()) - Preferences.setEditor( - "SqlFoldOnlyBegin", - self.sqlFoldOnlyBeginCheckBox.isChecked()) - Preferences.setEditor( - "SqlDottedWords", - self.sqlDottedWordsCheckBox.isChecked()) - Preferences.setEditor( - "SqlHashComments", - self.sqlHashCommentsCheckBox.isChecked()) - Preferences.setEditor( - "SqlQuotedIdentifiers", - self.sqlQuotedIdentifiersCheckBox.isChecked()) + Preferences.setEditor( + "SqlFoldAtElse", + self.sqlFoldAtElseCheckBox.isChecked()) + Preferences.setEditor( + "SqlFoldOnlyBegin", + self.sqlFoldOnlyBeginCheckBox.isChecked()) + Preferences.setEditor( + "SqlDottedWords", + self.sqlDottedWordsCheckBox.isChecked()) + Preferences.setEditor( + "SqlHashComments", + self.sqlHashCommentsCheckBox.isChecked()) + Preferences.setEditor( + "SqlQuotedIdentifiers", + self.sqlQuotedIdentifiersCheckBox.isChecked()) # TCL - if QSCINTILLA_VERSION() >= 0x020500: - Preferences.setEditor( - "TclFoldComment", - self.foldTclCommentCheckBox.isChecked()) + Preferences.setEditor( + "TclFoldComment", + self.foldTclCommentCheckBox.isChecked()) # TeX - if QSCINTILLA_VERSION() >= 0x020500: - Preferences.setEditor( - "TexFoldComment", - self.foldTexCommentCheckBox.isChecked()) - Preferences.setEditor( - "TexProcessComments", - self.texProcessCommentsCheckBox.isChecked()) - Preferences.setEditor( - "TexProcessIf", - self.texProcessIfCheckBox.isChecked()) + Preferences.setEditor( + "TexFoldComment", + self.foldTexCommentCheckBox.isChecked()) + Preferences.setEditor( + "TexProcessComments", + self.texProcessCommentsCheckBox.isChecked()) + Preferences.setEditor( + "TexProcessIf", + self.texProcessIfCheckBox.isChecked()) # VHDL Preferences.setEditor( @@ -603,10 +540,9 @@ self.xmlSyleScriptsCheckBox.isChecked()) # YAML - if "YAML" in self.languages: - Preferences.setEditor( - "YAMLFoldComment", - self.foldYamlCommentCheckBox.isChecked()) + Preferences.setEditor( + "YAMLFoldComment", + self.foldYamlCommentCheckBox.isChecked()) def create(dlg):
diff -r 852016bbdedb -r c307358a2ecc Preferences/ConfigurationPages/EditorPropertiesPage.ui --- a/Preferences/ConfigurationPages/EditorPropertiesPage.ui Fri Jan 27 19:18:52 2017 +0100 +++ b/Preferences/ConfigurationPages/EditorPropertiesPage.ui Fri Feb 03 19:20:59 2017 +0100 @@ -7,10 +7,10 @@ <x>0</x> <y>0</y> <width>558</width> - <height>2611</height> + <height>2930</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout"> + <layout class="QVBoxLayout" name="verticalLayout_2"> <item> <widget class="QLabel" name="headerLabel"> <property name="text"> @@ -472,6 +472,35 @@ </widget> </item> <item> + <widget class="QGroupBox" name="jsonGroup"> + <property name="title"> + <string>JSON</string> + </property> + <layout class="QGridLayout" name="gridLayout_12"> + <item row="0" column="0"> + <widget class="QCheckBox" name="jsonHighlightCommentsCheckBox"> + <property name="toolTip"> + <string>Select to enable highlighting of line/block comments</string> + </property> + <property name="text"> + <string>Highlight comments</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QCheckBox" name="jsonHighlightEscapeCheckBox"> + <property name="toolTip"> + <string>Select to enable highlighting of escape sequences in strings</string> + </property> + <property name="text"> + <string>Highlight escape sequences</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> <widget class="QGroupBox" name="pascalGroup"> <property name="title"> <string>Pascal Lexer Properties</string> @@ -1077,6 +1106,8 @@ <tabstop>htmlDjangoCheckBox</tabstop> <tabstop>htmlMakoCheckBox</tabstop> <tabstop>xmlSyleScriptsCheckBox</tabstop> + <tabstop>jsonHighlightCommentsCheckBox</tabstop> + <tabstop>jsonHighlightEscapeCheckBox</tabstop> <tabstop>foldPascalCommentCheckBox</tabstop> <tabstop>foldPascalPreprocessorCheckBox</tabstop> <tabstop>pascalSmartHighlightingCheckBox</tabstop>
diff -r 852016bbdedb -r c307358a2ecc Preferences/ConfigurationPages/EditorStylesPage.py --- a/Preferences/ConfigurationPages/EditorStylesPage.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Preferences/ConfigurationPages/EditorStylesPage.py Fri Feb 03 19:20:59 2017 +0100 @@ -196,6 +196,8 @@ self.miniMenuCheckBox.setChecked( Preferences.getEditor("MiniContextMenu")) + self.hideFormatButtonsCheckBox.setChecked( + Preferences.getEditor("HideFormatButtons")) self.enableAnnotationsCheckBox.setChecked( Preferences.getEditor("AnnotationsEnabled")) @@ -324,6 +326,8 @@ Preferences.setEditor( "MiniContextMenu", self.miniMenuCheckBox.isChecked()) + Preferences.setEditor( + "HideFormatButtons", self.hideFormatButtonsCheckBox.isChecked()) Preferences.setEditor( "AnnotationsEnabled", self.enableAnnotationsCheckBox.isChecked())
diff -r 852016bbdedb -r c307358a2ecc Preferences/ConfigurationPages/EditorStylesPage.ui --- a/Preferences/ConfigurationPages/EditorStylesPage.ui Fri Jan 27 19:18:52 2017 +0100 +++ b/Preferences/ConfigurationPages/EditorStylesPage.ui Fri Feb 03 19:20:59 2017 +0100 @@ -10,7 +10,7 @@ <height>2312</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout_7"> + <layout class="QVBoxLayout" name="verticalLayout_8"> <item> <widget class="QLabel" name="headerLabel"> <property name="text"> @@ -1849,8 +1849,8 @@ <property name="title"> <string>Various</string> </property> - <layout class="QGridLayout" name="_14"> - <item row="0" column="0"> + <layout class="QVBoxLayout" name="verticalLayout_7"> + <item> <widget class="QCheckBox" name="miniMenuCheckBox"> <property name="toolTip"> <string>Select to show a minimalistic context menu</string> @@ -1860,6 +1860,16 @@ </property> </widget> </item> + <item> + <widget class="QCheckBox" name="hideFormatButtonsCheckBox"> + <property name="toolTip"> + <string>Select to hide the Format Buttons bar when formatting is not supported</string> + </property> + <property name="text"> + <string>Hide Format Buttons bar when not supported</string> + </property> + </widget> + </item> </layout> </widget> </item>
diff -r 852016bbdedb -r c307358a2ecc Preferences/ConfigurationPages/EmailPage.py --- a/Preferences/ConfigurationPages/EmailPage.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Preferences/ConfigurationPages/EmailPage.py Fri Feb 03 19:20:59 2017 +0100 @@ -41,13 +41,18 @@ self.portSpin.setValue(Preferences.getUser("MailServerPort")) self.emailEdit.setText(Preferences.getUser("Email")) self.signatureEdit.setPlainText(Preferences.getUser("Signature")) - self.mailAuthenticationCheckBox.setChecked( + self.mailAuthenticationGroup.setChecked( Preferences.getUser("MailServerAuthentication")) self.mailUserEdit.setText(Preferences.getUser("MailServerUser")) self.mailPasswordEdit.setText( Preferences.getUser("MailServerPassword")) - self.useTlsCheckBox.setChecked( - Preferences.getUser("MailServerUseTLS")) + encryption = Preferences.getUser("MailServerEncryption") + if encryption == "TLS": + self.useTlsButton.setChecked(True) + elif encryption == "SSL": + self.useSslButton.setChecked(True) + else: + self.noEncryptionButton.setChecked(True) def save(self): """ @@ -67,35 +72,91 @@ self.signatureEdit.toPlainText()) Preferences.setUser( "MailServerAuthentication", - self.mailAuthenticationCheckBox.isChecked()) + self.mailAuthenticationGroup.isChecked()) Preferences.setUser( "MailServerUser", self.mailUserEdit.text()) Preferences.setUser( "MailServerPassword", self.mailPasswordEdit.text()) - Preferences.setUser( - "MailServerUseTLS", - self.useTlsCheckBox.isChecked()) + if self.useTlsButton.isChecked(): + encryption = "TLS" + elif self.useSslButton.isChecked(): + encryption = "SSL" + else: + encryption = "No" + Preferences.setUser("MailServerEncryption", encryption) + + def __updatePortSpin(self): + """ + Private slot to set the value of the port spin box depending upon + the selected encryption method. + """ + if self.useSslButton.isChecked(): + self.portSpin.setValue(465) + elif self.useTlsButton.isChecked(): + self.portSpin.setValue(587) + else: + self.portSpin.setValue(25) + + @pyqtSlot(bool) + def on_noEncryptionButton_toggled(self, checked): + """ + Private slot handling a change of no encryption button. + + @param checked current state of the button + @type bool + """ + self.__updatePortSpin() + + @pyqtSlot(bool) + def on_useSslButton_toggled(self, checked): + """ + Private slot handling a change of SSL encryption button. + + @param checked current state of the button + @type bool + """ + self.__updatePortSpin() + + @pyqtSlot(bool) + def on_useTlsButton_toggled(self, checked): + """ + Private slot handling a change of TLS encryption button. + + @param checked current state of the button + @type bool + """ + self.__updatePortSpin() def __updateTestButton(self): """ Private slot to update the enabled state of the test button. """ self.testButton.setEnabled( - self.mailAuthenticationCheckBox.isChecked() and + self.mailAuthenticationGroup.isChecked() and self.mailUserEdit.text() != "" and self.mailPasswordEdit.text() != "" and self.mailServerEdit.text() != "" ) + @pyqtSlot(str) + def on_mailServerEdit_textChanged(self, txt): + """ + Private slot to handle a change of the text of the mail server edit. + + @param txt current text of the edit (string) + @type str + """ + self.__updateTestButton() + @pyqtSlot(bool) - def on_mailAuthenticationCheckBox_toggled(self, checked): + def on_mailAuthenticationGroup_toggled(self, checked): """ Private slot to handle a change of the state of the authentication - selector. + group. - @param checked state of the checkbox (boolean) + @param checked state of the group (boolean) """ self.__updateTestButton() @@ -125,11 +186,16 @@ QApplication.setOverrideCursor(QCursor(Qt.WaitCursor)) QApplication.processEvents() try: - server = smtplib.SMTP(self.mailServerEdit.text(), - self.portSpin.value(), - timeout=10) - if self.useTlsCheckBox.isChecked(): - server.starttls() + if self.useSslButton.isChecked(): + server = smtplib.SMTP_SSL(self.mailServerEdit.text(), + self.portSpin.value(), + timeout=10) + else: + server = smtplib.SMTP(self.mailServerEdit.text(), + self.portSpin.value(), + timeout=10) + if self.useTlsButton.isChecked(): + server.starttls() try: server.login(self.mailUserEdit.text(), self.mailPasswordEdit.text())
diff -r 852016bbdedb -r c307358a2ecc Preferences/ConfigurationPages/EmailPage.ui --- a/Preferences/ConfigurationPages/EmailPage.ui Fri Jan 27 19:18:52 2017 +0100 +++ b/Preferences/ConfigurationPages/EmailPage.ui Fri Feb 03 19:20:59 2017 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>422</width> - <height>512</height> + <height>543</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout"> @@ -48,13 +48,77 @@ </widget> </item> <item row="1" column="0"> - <widget class="QLabel" name="label"> + <widget class="QLabel" name="label_2"> <property name="text"> - <string>Outgoing mail server port:</string> + <string>Encryption Method:</string> </property> </widget> </item> - <item row="1" column="1"> + <item row="1" column="1" colspan="2"> + <widget class="QFrame" name="frame"> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <widget class="QRadioButton" name="noEncryptionButton"> + <property name="toolTip"> + <string>Select to use no encryption</string> + </property> + <property name="text"> + <string>None</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="useSslButton"> + <property name="toolTip"> + <string>Select to use SSL</string> + </property> + <property name="text"> + <string>SSL</string> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="useTlsButton"> + <property name="toolTip"> + <string>Select to use TLS</string> + </property> + <property name="text"> + <string>TLS</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Port:</string> + </property> + </widget> + </item> + <item row="2" column="1"> <widget class="QSpinBox" name="portSpin"> <property name="toolTip"> <string>Enter the port of the mail server</string> @@ -73,34 +137,34 @@ </property> </widget> </item> - <item row="1" column="2"> + <item row="2" column="2"> <spacer name="horizontalSpacer"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> - <width>118</width> + <width>138</width> <height>20</height> </size> </property> </spacer> </item> - <item row="2" column="0"> + <item row="3" column="0"> <widget class="QLabel" name="textLabel1_5"> <property name="text"> <string>Email address:</string> </property> </widget> </item> - <item row="2" column="1" colspan="2"> + <item row="3" column="1" colspan="2"> <widget class="QLineEdit" name="emailEdit"> <property name="toolTip"> <string>Enter your email address</string> </property> </widget> </item> - <item row="3" column="0"> + <item row="4" column="0"> <widget class="QLabel" name="textLabel1_6"> <property name="text"> <string>Signature:</string> @@ -110,7 +174,7 @@ </property> </widget> </item> - <item row="3" column="1" colspan="2"> + <item row="4" column="1" colspan="2"> <widget class="QTextEdit" name="signatureEdit"> <property name="toolTip"> <string>Enter your email signature</string> @@ -123,83 +187,62 @@ </layout> </item> <item> - <widget class="QCheckBox" name="useTlsCheckBox"> - <property name="toolTip"> - <string>Select to use TLS</string> - </property> - <property name="text"> - <string>Use TLS</string> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="mailAuthenticationCheckBox"> + <widget class="QGroupBox" name="mailAuthenticationGroup"> <property name="toolTip"> <string>Select to authenticatate against the mail server</string> </property> - <property name="text"> + <property name="title"> <string>Mail server needs authentication</string> </property> + <property name="checkable"> + <bool>true</bool> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="textLabel1_15"> + <property name="text"> + <string>Username:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="mailUserEdit"> + <property name="toolTip"> + <string>Enter your mail server username</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="textLabel2_7"> + <property name="text"> + <string>Password:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="mailPasswordEdit"> + <property name="toolTip"> + <string>Enter your password for accessing the mail server</string> + </property> + <property name="echoMode"> + <enum>QLineEdit::Password</enum> + </property> + </widget> + </item> + <item row="2" column="0" colspan="2"> + <widget class="QPushButton" name="testButton"> + <property name="toolTip"> + <string>Press to test the login data</string> + </property> + <property name="text"> + <string>Test Login</string> + </property> + </widget> + </item> + </layout> </widget> </item> <item> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="textLabel1_15"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="text"> - <string>Username:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QLineEdit" name="mailUserEdit"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Enter your mail server username</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="textLabel2_7"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="text"> - <string>Password:</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QLineEdit" name="mailPasswordEdit"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Enter your password for accessing the mail server</string> - </property> - <property name="echoMode"> - <enum>QLineEdit::Password</enum> - </property> - </widget> - </item> - <item row="2" column="0" colspan="2"> - <widget class="QPushButton" name="testButton"> - <property name="toolTip"> - <string>Press to test the login data</string> - </property> - <property name="text"> - <string>Test Login</string> - </property> - </widget> - </item> - </layout> - </item> - <item> <spacer> <property name="orientation"> <enum>Qt::Vertical</enum> @@ -216,79 +259,17 @@ </widget> <tabstops> <tabstop>mailServerEdit</tabstop> + <tabstop>noEncryptionButton</tabstop> + <tabstop>useSslButton</tabstop> + <tabstop>useTlsButton</tabstop> <tabstop>portSpin</tabstop> <tabstop>emailEdit</tabstop> <tabstop>signatureEdit</tabstop> - <tabstop>useTlsCheckBox</tabstop> - <tabstop>mailAuthenticationCheckBox</tabstop> + <tabstop>mailAuthenticationGroup</tabstop> <tabstop>mailUserEdit</tabstop> <tabstop>mailPasswordEdit</tabstop> + <tabstop>testButton</tabstop> </tabstops> <resources/> - <connections> - <connection> - <sender>mailAuthenticationCheckBox</sender> - <signal>toggled(bool)</signal> - <receiver>textLabel1_15</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>39</x> - <y>350</y> - </hint> - <hint type="destinationlabel"> - <x>49</x> - <y>377</y> - </hint> - </hints> - </connection> - <connection> - <sender>mailAuthenticationCheckBox</sender> - <signal>toggled(bool)</signal> - <receiver>textLabel2_7</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>74</x> - <y>350</y> - </hint> - <hint type="destinationlabel"> - <x>16</x> - <y>403</y> - </hint> - </hints> - </connection> - <connection> - <sender>mailAuthenticationCheckBox</sender> - <signal>toggled(bool)</signal> - <receiver>mailUserEdit</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>105</x> - <y>350</y> - </hint> - <hint type="destinationlabel"> - <x>193</x> - <y>377</y> - </hint> - </hints> - </connection> - <connection> - <sender>mailAuthenticationCheckBox</sender> - <signal>toggled(bool)</signal> - <receiver>mailPasswordEdit</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>176</x> - <y>350</y> - </hint> - <hint type="destinationlabel"> - <x>243</x> - <y>403</y> - </hint> - </hints> - </connection> - </connections> + <connections/> </ui>
diff -r 852016bbdedb -r c307358a2ecc Preferences/__init__.py --- a/Preferences/__init__.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Preferences/__init__.py Fri Feb 03 19:20:59 2017 +0100 @@ -434,6 +434,7 @@ "AnnotationsEnabled": True, "MiniContextMenu": False, + "HideFormatButtons": True, "SearchMarkersEnabled": True, "QuickSearchMarkersEnabled": True, @@ -522,6 +523,10 @@ "HtmlDjangoTemplates": False, "HtmlMakoTemplates": False, + # JSON specifics + "JSONHightlightComments": True, + "JSONHighlightEscapeSequences": True, + # Pascal specifics "PascalFoldComment": True, "PascalFoldPreprocessor": False, @@ -1217,7 +1222,7 @@ "MailServerAuthentication": False, "MailServerUser": "", "MailServerPassword": "", - "MailServerUseTLS": False, + "MailServerEncryption": "No", # valid values: No, SSL, TLS "MailServerPort": 25, "UseSystemEmailClient": False, "MasterPassword": "", # stores the password hash @@ -3072,11 +3077,19 @@ elif key in ["MailServerPort"]: return int(prefClass.settings.value( "User/" + key, prefClass.userDefaults[key])) - elif key in ["MailServerAuthentication", "MailServerUseTLS", - "UseSystemEmailClient", "UseMasterPassword", - "SavePasswords"]: + elif key in ["MailServerAuthentication", "UseSystemEmailClient", + "UseMasterPassword", "SavePasswords"]: return toBool(prefClass.settings.value( "User/" + key, prefClass.userDefaults[key])) + elif key == "MailServerEncryption": + # convert from old key 'MailServerUseTLS' + val = prefClass.settings.value("User/" + key) + if val is None: + if toBool(prefClass.settings.value("User/MailServerUseTLS")): + val = "TLS" + else: + val = prefClass.userDefaults[key] + return val else: return prefClass.settings.value( "User/" + key, prefClass.userDefaults[key])
diff -r 852016bbdedb -r c307358a2ecc Project/LexerAssociationDialog.py --- a/Project/LexerAssociationDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Project/LexerAssociationDialog.py Fri Feb 03 19:20:59 2017 +0100 @@ -51,7 +51,10 @@ languages = [''] + \ sorted(QScintilla.Lexers.getSupportedLanguages().keys()) + \ self.extras - self.editorLexerCombo.addItems(languages) + for lang in languages: + self.editorLexerCombo.addItem( + QScintilla.Lexers.getLanguageIcon(lang, False), + lang) from pygments.lexers import get_all_lexers pygmentsLexers = [''] + sorted([l[0] for l in get_all_lexers()])
diff -r 852016bbdedb -r c307358a2ecc Project/Project.py --- a/Project/Project.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Project/Project.py Fri Feb 03 19:20:59 2017 +0100 @@ -523,28 +523,47 @@ Public method to initialize the filetype associations with default values. """ - self.pdata["FILETYPES"] = {} + self.pdata["FILETYPES"] = { + "*.txt": "OTHERS", + "*.md": "OTHERS", + "*.rst": "OTHERS", + "README": "OTHERS", + "README.*": "OTHERS", + "*.e4p": "OTHERS", + } + + # Sources if self.pdata["MIXEDLANGUAGE"]: sourceKey = "Mixed" else: sourceKey = self.pdata["PROGLANGUAGE"] for ext in self.__sourceExtensions(sourceKey): self.pdata["FILETYPES"]["*{0}".format(ext)] = "SOURCES" + + # IDL interfaces self.pdata["FILETYPES"]["*.idl"] = "INTERFACES" + + # Forms if self.pdata["PROJECTTYPE"] in ["Qt4", "PyQt5", "E6Plugin", "PySide"]: self.pdata["FILETYPES"]["*.ui"] = "FORMS" + + # Resources if self.pdata["PROJECTTYPE"] in ["Qt4", "Qt4C", "E6Plugin", "PyQt5", "PyQt5C", "PySide", "PySideC"]: self.pdata["FILETYPES"]["*.qrc"] = "RESOURCES" + + # Translations if self.pdata["PROJECTTYPE"] in ["Qt4", "Qt4C", "E6Plugin", "PyQt5", "PyQt5C", "PySide", "PySideC"]: self.pdata["FILETYPES"]["*.ts"] = "TRANSLATIONS" self.pdata["FILETYPES"]["*.qm"] = "TRANSLATIONS" + + # Project type specific ones try: if self.__fileTypeCallbacks[ self.pdata["PROJECTTYPE"]] is not None: @@ -553,6 +572,7 @@ self.pdata["FILETYPES"].update(ftypes) except KeyError: pass + self.setDirty(True) def updateFileTypes(self): @@ -4945,7 +4965,7 @@ lines = names.splitlines() archiveName = "" - archiveVersion="" + archiveVersion = "" names = [] for line in lines: if line.startswith(";"):
diff -r 852016bbdedb -r c307358a2ecc QScintilla/Editor.py --- a/QScintilla/Editor.py Fri Jan 27 19:18:52 2017 +0100 +++ b/QScintilla/Editor.py Fri Feb 03 19:20:59 2017 +0100 @@ -84,6 +84,8 @@ @signal lastEditPositionAvailable() emitted when a last edit position is available @signal refreshed() emitted to signal a refresh of the editor contents + @signal settingsRead() emitted to signal, that the settings have been read + and set """ modificationStatusChanged = pyqtSignal(bool, QsciScintillaCompat) undoAvailable = pyqtSignal(bool) @@ -107,6 +109,7 @@ encodingChanged = pyqtSignal(str) lastEditPositionAvailable = pyqtSignal() refreshed = pyqtSignal() + settingsRead = pyqtSignal() WarningCode = 1 WarningStyle = 2 @@ -4063,6 +4066,8 @@ self.__refreshAnnotations() self.__markerMap.initColors() + + self.settingsRead.emit() def __setLineMarkerColours(self): """
diff -r 852016bbdedb -r c307358a2ecc QScintilla/EditorAssembly.py --- a/QScintilla/EditorAssembly.py Fri Jan 27 19:18:52 2017 +0100 +++ b/QScintilla/EditorAssembly.py Fri Feb 03 19:20:59 2017 +0100 @@ -41,14 +41,18 @@ self.__layout.setContentsMargins(0, 0, 0, 0) self.__layout.setSpacing(1) + from .EditorButtonsWidget import EditorButtonsWidget + from .Editor import Editor + + self.__editor = Editor(dbs, fn, vm, filetype, editor, tv) + self.__buttonsWidget = EditorButtonsWidget(self.__editor, self) self.__globalsCombo = QComboBox() self.__membersCombo = QComboBox() - from .Editor import Editor - self.__editor = Editor(dbs, fn, vm, filetype, editor, tv) - self.__layout.addWidget(self.__globalsCombo, 0, 0) - self.__layout.addWidget(self.__membersCombo, 0, 1) - self.__layout.addWidget(self.__editor, 1, 0, 1, -1) + self.__layout.addWidget(self.__buttonsWidget, 1, 0, -1, 1) + self.__layout.addWidget(self.__globalsCombo, 0, 1) + self.__layout.addWidget(self.__membersCombo, 0, 2) + self.__layout.addWidget(self.__editor, 1, 1, 1, -1) self.__module = None
diff -r 852016bbdedb -r c307358a2ecc QScintilla/EditorButtonsWidget.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/QScintilla/EditorButtonsWidget.py Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,363 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a widget containing various buttons for accessing +editor actions. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import pyqtSlot, Qt +from PyQt5.QtWidgets import QWidget, QVBoxLayout, QToolButton, QFrame, QMenu, \ + QSizePolicy, QScrollArea + +import UI.PixmapCache +import Preferences + +from . import MarkupProviders + + +class EditorButtonsWidget(QWidget): + """ + Class implementing a widget containing various buttons for accessing + editor actions. + """ + def __init__(self, editor, parent=None): + """ + Constructor + + @param editor reference to the editor + @type Editor + @param parent reference to the parent widget + @type QWidget + """ + super(EditorButtonsWidget, self).__init__(parent) + + margin = 2 + spacing = 3 + + self.__buttonsWidget = QWidget(self) + + self.__layout = QVBoxLayout(self.__buttonsWidget) + self.__layout.setContentsMargins(0, 0, 0, 0) + self.__layout.setSpacing(spacing) + + self.__provider = None + + self.__editor = editor + self.__editor.languageChanged.connect(self.__updateButtonStates) + self.__editor.editorSaved.connect(self.__updateButtonStates) + self.__editor.editorRenamed.connect(self.__updateButtonStates) + self.__editor.selectionChanged.connect(self.__editorSelectionChanged) + self.__editor.settingsRead.connect(self.__editorSettingsRead) + + self.__createButtons() + + self.__layout.addStretch() + + self.__outerLayout = QVBoxLayout(self) + self.__outerLayout.setContentsMargins(margin, margin, margin, margin) + self.__outerLayout.setSpacing(spacing) + self.__outerLayout.setAlignment(Qt.AlignHCenter) + + self.__upButton = QToolButton(self) + self.__upButton.setArrowType(Qt.UpArrow) + self.__upButton.setSizePolicy( + QSizePolicy.MinimumExpanding, QSizePolicy.Minimum) + self.__upButton.setAutoRepeat(True) + + self.__scroller = QScrollArea(self) + self.__scroller.setWidget(self.__buttonsWidget) + self.__scroller.setSizePolicy( + QSizePolicy.Minimum, QSizePolicy.Expanding) + self.__scroller.setFrameShape(QFrame.NoFrame) + self.__scroller.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff) + self.__scroller.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff) + self.__scroller.setWidgetResizable(False) + + self.__downButton = QToolButton(self) + self.__downButton.setArrowType(Qt.DownArrow) + self.__downButton.setSizePolicy( + QSizePolicy.MinimumExpanding, QSizePolicy.Minimum) + self.__downButton.setAutoRepeat(True) + + self.__outerLayout.addWidget(self.__upButton) + self.__outerLayout.addWidget(self.__scroller) + self.__outerLayout.addWidget(self.__downButton) + + self.__upButton.clicked.connect(self.__slideUp) + self.__downButton.clicked.connect(self.__slideDown) + + self.setMaximumWidth( + self.__buttons["bold"].sizeHint().width() + 2 * margin) + + self.__updateButtonStates() + + ####################################################################### + ## Methods below implement some event handlers + ####################################################################### + + def show(self): + """ + Public slot to show the widget. + """ + super(EditorButtonsWidget, self).show() + self.__enableScrollerButtons() + + def resizeEvent(self, evt): + """ + Protected method to handle resize events. + + @param evt reference to the resize event (QResizeEvent) + """ + self.__enableScrollerButtons() + super(EditorButtonsWidget, self).resizeEvent(evt) + + ####################################################################### + ## Methods below implement scroller related functions + ####################################################################### + + def __enableScrollerButtons(self): + """ + Private method to set the enabled state of the scroll buttons. + """ + scrollBar = self.__scroller.verticalScrollBar() + self.__upButton.setEnabled(scrollBar.value() > 0) + self.__downButton.setEnabled(scrollBar.value() < scrollBar.maximum()) + + def __slideUp(self): + """ + Private slot to move the widget upwards, i.e. show contents to the + bottom. + """ + self.__slide(True) + + def __slideDown(self): + """ + Private slot to move the widget downwards, i.e. show contents to + the top. + """ + self.__slide(False) + + def __slide(self, up): + """ + Private method to move the sliding widget. + + @param up flag indicating to move upwards (boolean) + """ + scrollBar = self.__scroller.verticalScrollBar() + stepSize = scrollBar.singleStep() + if up: + stepSize = -stepSize + newValue = scrollBar.value() + stepSize + if newValue < 0: + newValue = 0 + elif newValue > scrollBar.maximum(): + newValue = scrollBar.maximum() + scrollBar.setValue(newValue) + self.__enableScrollerButtons() + + ####################################################################### + ## Methods below implement the format button functions + ####################################################################### + + def __createButtons(self): + """ + Private slot to create the various tool buttons. + """ + self.__buttons = {} + self.__separators = [] + self.__headerMenu = QMenu() + + self.__addButton("bold", "formatTextBold.png", + self.tr("Bold")) + self.__addButton("italic", "formatTextItalic.png", + self.tr("Italic")) + self.__addButton("strikethrough", "formatTextStrikethrough.png", + self.tr("Strike Through")) + self.__addSeparator() + self.__addButton("header1", "formatTextHeader1.png", + self.tr("Header 1")) + self.__addButton("header2", "formatTextHeader2.png", + self.tr("Header 2")) + self.__addButton("header3", "formatTextHeader3.png", + self.tr("Header 3")) + button = self.__addButton("header", "formatTextHeader.png", + self.tr("Header")) + button.setPopupMode(QToolButton.InstantPopup) + button.setMenu(self.__headerMenu) + self.__addSeparator() + self.__addButton("code", "formatTextInlineCode.png", + self.tr("Inline Code")) + self.__addButton("codeBlock", "formatTextCodeBlock.png", + self.tr("Code Block")) + self.__addButton("quote", "formatTextQuote.png", + self.tr("Quote")) + self.__addSeparator() + self.__addButton("hyperlink", "formatTextHyperlink.png", + self.tr("Add Hyperlink")) + self.__addButton("line", "formatTextHorizontalLine.png", + self.tr("Add Horizontal Line")) + self.__addButton("image", "formatTextImage.png", + self.tr("Add Image")) + self.__addSeparator() + self.__addButton("bulletedList", "formatTextBulletedList.png", + self.tr("Add Bulleted List")) + self.__addButton("numberedList", "formatTextNumberedList.png", + self.tr("Add Numbered List")) + + self.__headerMenu.triggered.connect(self.__headerMenuTriggered) + + def __addButton(self, format, iconName, toolTip): + """ + Private method to add a format button. + + @param format unique name of the format + @type str + @param iconName name of the icon for the button + @type str + @param toolTip text for the tool tip + @type str + @return generated button + @rtype QToolButton + """ + button = QToolButton(self.__buttonsWidget) + button.setIcon(UI.PixmapCache.getIcon(iconName)) + button.setToolTip(toolTip) + button.clicked.connect(lambda: self.__formatClicked(format)) + self.__layout.addWidget(button) + self.__buttons[format] = button + + return button + + def __addSeparator(self): + """ + Private method to add a separator line. + """ + line = QFrame(self.__buttonsWidget) + line.setLineWidth(2) + if isinstance(self.__layout, QVBoxLayout): + line.setFrameShape(QFrame.HLine) + else: + line.setFrameShape(QFrame.VLine) + line.setFrameShadow(QFrame.Sunken) + + self.__layout.addWidget(line) + self.__separators.append(line) + + @pyqtSlot() + def __updateButtonStates(self): + """ + Private slot to change the button states. + """ + provider = MarkupProviders.getMarkupProvider(self.__editor) + if self.__provider is None or \ + provider.kind() != self.__provider.kind(): + self.__provider = provider + + self.__buttons["bold"].setEnabled(self.__provider.hasBold()) + self.__buttons["italic"].setEnabled(self.__provider.hasItalic()) + self.__buttons["strikethrough"].setEnabled( + self.__provider.hasStrikethrough()) + + headerLevels = self.__provider.headerLevels() + self.__buttons["header1"].setEnabled(headerLevels >= 1) + self.__buttons["header2"].setEnabled(headerLevels >= 2) + self.__buttons["header3"].setEnabled(headerLevels >= 3) + self.__buttons["header"].setEnabled(headerLevels > 3) + self.__headerMenu.clear() + for level in range(1, headerLevels + 1): + act = self.__headerMenu.addAction( + self.tr("Level {0}").format(level)) + act.setData("header{0}".format(level)) + + self.__buttons["code"].setEnabled(self.__provider.hasCode()) + self.__buttons["codeBlock"].setEnabled( + self.__provider.hasCodeBlock()) + + self.__buttons["bulletedList"].setEnabled( + self.__provider.hasBulletedList()) + self.__buttons["numberedList"].setEnabled( + self.__provider.hasNumberedList()) + + self.__editorSelectionChanged() + + if Preferences.getEditor("HideFormatButtons"): + self.setVisible(self.__provider.kind() != "none") + + def __formatClicked(self, format): + """ + Private slot to handle a format button being clicked. + + @param format format type of the button + @type str + """ + if format == "bold": + self.__provider.bold(self.__editor) + elif format == "italic": + self.__provider.italic(self.__editor) + elif format == "strikethrough": + self.__provider.strikethrough(self.__editor) + elif format.startswith("header"): + try: + level = int(format[-1]) + self.__provider.header(self.__editor, level) + except ValueError: + pass + elif format == "code": + self.__provider.code(self.__editor) + elif format == "codeBlock": + self.__provider.codeBlock(self.__editor) + elif format == "quote": + self.__provider.quote(self.__editor) + elif format == "hyperlink": + self.__provider.hyperlink(self.__editor) + elif format == "line": + self.__provider.line(self.__editor) + elif format == "image": + self.__provider.image(self.__editor) + elif format == "bulletedList": + self.__provider.bulletedList(self.__editor) + elif format == "numberedList": + self.__provider.numberedList(self.__editor) + + def __headerMenuTriggered(self, act): + """ + Private method handling the selection of a header menu entry. + + @param act action of the headers menu that was triggered + @type QAction + """ + format = act.data() + self.__formatClicked(format) + + def __editorSelectionChanged(self): + """ + Private slot to handle a change of the editor's selection. + """ + hasSelection = self.__editor.hasSelectedText() + if self.__provider: + self.__buttons["quote"].setEnabled( + self.__provider.hasQuote() and ( + self.__provider.kind() == "html" or hasSelection + ) + ) + self.__buttons["hyperlink"].setEnabled( + self.__provider.hasHyperlink() and not hasSelection) + self.__buttons["line"].setEnabled( + self.__provider.hasLine() and not hasSelection) + self.__buttons["image"].setEnabled( + self.__provider.hasImage() and not hasSelection) + + def __editorSettingsRead(self): + """ + Private slot to handle a change of the editor related settings. + """ + if Preferences.getEditor("HideFormatButtons"): + if self.__provider is not None: + self.setVisible(self.__provider.kind() != "none") + else: + self.setVisible(True)
diff -r 852016bbdedb -r c307358a2ecc QScintilla/Lexers/LexerFortran.py --- a/QScintilla/Lexers/LexerFortran.py Fri Jan 27 19:18:52 2017 +0100 +++ b/QScintilla/Lexers/LexerFortran.py Fri Feb 03 19:20:59 2017 +0100 @@ -28,7 +28,7 @@ QsciLexerFortran.__init__(self, parent) Lexer.__init__(self) - self.commentString = "!" + self.commentString = "c " def initProperties(self): """
diff -r 852016bbdedb -r c307358a2ecc QScintilla/Lexers/LexerFortran77.py --- a/QScintilla/Lexers/LexerFortran77.py Fri Jan 27 19:18:52 2017 +0100 +++ b/QScintilla/Lexers/LexerFortran77.py Fri Feb 03 19:20:59 2017 +0100 @@ -28,7 +28,7 @@ QsciLexerFortran77.__init__(self, parent) Lexer.__init__(self) - self.commentString = "c" + self.commentString = "c " def initProperties(self): """
diff -r 852016bbdedb -r c307358a2ecc QScintilla/Lexers/LexerJSON.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/QScintilla/Lexers/LexerJSON.py Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,83 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a JSON lexer with some additional methods. +""" + +from __future__ import unicode_literals + +from PyQt5.Qsci import QsciLexerJSON + +from .Lexer import Lexer +import Preferences + + +class LexerJSON(Lexer, QsciLexerJSON): + """ + Subclass to implement some additional lexer dependent methods. + """ + def __init__(self, parent=None): + """ + Constructor + + @param parent parent widget of this lexer + """ + QsciLexerJSON.__init__(self, parent) + Lexer.__init__(self) + + self.commentString = "//" + self.streamCommentString = { + 'start': '/* ', + 'end': ' */' + } + + def initProperties(self): + """ + Public slot to initialize the properties. + """ + self.setHighlightComments( + Preferences.getEditor("JSONHightlightComments")) + self.setHighlightEscapeSequences( + Preferences.getEditor("JSONHighlightEscapeSequences")) + self.setFoldCompact( + Preferences.getEditor("AllFoldCompact")) + + def isCommentStyle(self, style): + """ + Public method to check, if a style is a comment style. + + @param style style to check (integer) + @return flag indicating a comment style (boolean) + """ + return style in [QsciLexerJSON.CommentLine, + QsciLexerJSON.CommentBlock] + + def isStringStyle(self, style): + """ + Public method to check, if a style is a string style. + + @param style style to check (integer) + @return flag indicating a string style (boolean) + """ + return style in [QsciLexerJSON.String, + QsciLexerJSON.UnclosedString] + + def defaultKeywords(self, kwSet): + """ + Public method to get the default keywords. + + @param kwSet number of the keyword set (integer) + @return string giving the keywords (string) or None + """ + return QsciLexerJSON.keywords(self, kwSet) + + def maximumKeywordSet(self): + """ + Public method to get the maximum keyword set. + + @return maximum keyword set (integer) + """ + return 2
diff -r 852016bbdedb -r c307358a2ecc QScintilla/Lexers/LexerMarkdown.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/QScintilla/Lexers/LexerMarkdown.py Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,37 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a Markdown lexer with some additional methods. +""" + +from __future__ import unicode_literals + +from PyQt5.Qsci import QsciLexerMarkdown + +from .Lexer import Lexer + + +class LexerMarkdown(Lexer, QsciLexerMarkdown): + """ + Subclass to implement some additional lexer dependent methods. + """ + def __init__(self, parent=None): + """ + Constructor + + @param parent parent widget of this lexer + """ + QsciLexerMarkdown.__init__(self, parent) + Lexer.__init__(self) + + def defaultKeywords(self, kwSet): + """ + Public method to get the default keywords. + + @param kwSet number of the keyword set (integer) + @return string giving the keywords (string) or None + """ + return QsciLexerMarkdown.keywords(self, kwSet)
diff -r 852016bbdedb -r c307358a2ecc QScintilla/Lexers/__init__.py --- a/QScintilla/Lexers/__init__.py Fri Jan 27 19:18:52 2017 +0100 +++ b/QScintilla/Lexers/__init__.py Fri Feb 03 19:20:59 2017 +0100 @@ -112,6 +112,10 @@ "lexerLua.png"], "Makefile": [QCoreApplication.translate('Lexers', "Makefile"), 'dummy.mak', "lexerMakefile.png"], + "Matlab": [QCoreApplication.translate('Lexers', "Matlab"), + 'dummy.m.matlab', "lexerMatlab.png"], + "Octave": [QCoreApplication.translate('Lexers', "Octave"), + 'dummy.m.octave', "lexerOctave.png"], "Pascal": [QCoreApplication.translate('Lexers', "Pascal"), 'dummy.pas', "lexerPascal.png"], "Perl": [QCoreApplication.translate('Lexers', "Perl"), 'dummy.pl', @@ -144,14 +148,6 @@ "lexerYAML.png"], } - if QSCINTILLA_VERSION() >= 0x020501: - supportedLanguages.update({ - "Matlab": [QCoreApplication.translate('Lexers', "Matlab"), - 'dummy.m.matlab', "lexerMatlab.png"], - "Octave": [QCoreApplication.translate('Lexers', "Octave"), - 'dummy.m.octave', "lexerOctave.png"], - }) - if QSCINTILLA_VERSION() >= 0x020802: supportedLanguages["Gettext"] = \ [QCoreApplication.translate('Lexers', "Gettext"), 'dummy.po', @@ -162,6 +158,14 @@ [QCoreApplication.translate('Lexers', "CoffeeScript"), 'dummy.coffee', "lexerCoffeeScript.png"] + if QSCINTILLA_VERSION() >= 0x020a00: + supportedLanguages["JSON"] = \ + [QCoreApplication.translate('Lexers', "JSON"), + 'dummy.json', "lexerJSON.png"] + supportedLanguages["Markdown"] = \ + [QCoreApplication.translate('Lexers', "Markdown"), + 'dummy.md', "lexerMarkdown.png"] + for name in LexerRegistry: if not name.startswith("Pygments|"): supportedLanguages[name] = \ @@ -319,6 +323,12 @@ elif language == "CoffeeScript": from .LexerCoffeeScript import LexerCoffeeScript return LexerCoffeeScript(parent) + elif language == "JSON": + from .LexerJSON import LexerJSON + return LexerJSON(parent) + elif language == "Markdown": + from .LexerMarkdown import LexerMarkdown + return LexerMarkdown(parent) elif language in LexerRegistry: return LexerRegistry[language][2](parent) @@ -473,18 +483,14 @@ QCoreApplication.translate( 'Lexers', 'YAML Files (*.yaml *.yml)'), + QCoreApplication.translate( + 'Lexers', + 'Matlab Files (*.m *.m.matlab)'), + QCoreApplication.translate( + 'Lexers', + 'Octave Files (*.m *.m.octave)'), ] - if QSCINTILLA_VERSION() >= 0x020501: - openFileFiltersList.extend([ - QCoreApplication.translate( - 'Lexers', - 'Matlab Files (*.m *.m.matlab)'), - QCoreApplication.translate( - 'Lexers', - 'Octave Files (*.m *.m.octave)'), - ]) - if QSCINTILLA_VERSION() >= 0x020802: openFileFiltersList.append( QCoreApplication.translate( @@ -499,6 +505,18 @@ 'CoffeeScript Files (*.coffee)'), ) + if QSCINTILLA_VERSION() >= 0x020a00: + openFileFiltersList.append( + QCoreApplication.translate( + 'Lexers', + 'JSON Files (*.json)'), + ) + openFileFiltersList.append( + QCoreApplication.translate( + 'Lexers', + 'Markdown Files (*.md)'), + ) + for name in LexerRegistry: openFileFiltersList.extend(LexerRegistry[name][3]) @@ -678,18 +696,14 @@ QCoreApplication.translate( 'Lexers', 'YAML Files (*.yml)'), + QCoreApplication.translate( + 'Lexers', + 'Matlab Files (*.m)'), + QCoreApplication.translate( + 'Lexers', + 'Octave Files (*.m.octave)'), ] - if QSCINTILLA_VERSION() >= 0x020501: - saveFileFiltersList.extend([ - QCoreApplication.translate( - 'Lexers', - 'Matlab Files (*.m)'), - QCoreApplication.translate( - 'Lexers', - 'Octave Files (*.m.octave)'), - ]) - if QSCINTILLA_VERSION() >= 0x020802: saveFileFiltersList.append( QCoreApplication.translate( @@ -704,6 +718,18 @@ 'CoffeeScript Files (*.coffee)'), ) + if QSCINTILLA_VERSION() >= 0x020a00: + saveFileFiltersList.append( + QCoreApplication.translate( + 'Lexers', + 'JSON Files (*.json)'), + ) + saveFileFiltersList.append( + QCoreApplication.translate( + 'Lexers', + 'Markdown Files (*.md)'), + ) + for name in LexerRegistry: saveFileFiltersList.extend(LexerRegistry[name][4]) @@ -827,6 +853,9 @@ "*.xul": "XML", "*.yaml": "YAML", "*.yml": "YAML", + '*.m': "Matlab", + '*.m.matlab': "Matlab", + '*.m.octave': "Octave", '*.e4d': "XML", '*.e4k': "XML", '*.e4m': "XML", @@ -850,16 +879,16 @@ '*.e6t': "XML", } - if QSCINTILLA_VERSION() >= 0x020501: - assocs.update({ - '*.m': "Matlab", - '*.m.matlab': "Matlab", - '*.m.octave': "Octave", - }) + if QSCINTILLA_VERSION() >= 0x020802: + assocs['*.po'] = "Gettext" if QSCINTILLA_VERSION() >= 0x020803: assocs['*.coffee'] = "CoffeeScript" + if QSCINTILLA_VERSION() >= 0x020a00: + assocs['*.json'] = "JSON" + assocs['*.md'] = "Markdown" + for name in LexerRegistry: for pattern in LexerRegistry[name][5]: assocs[pattern] = name
diff -r 852016bbdedb -r c307358a2ecc QScintilla/MarkupProviders/HtmlProvider.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/QScintilla/MarkupProviders/HtmlProvider.py Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,410 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the HTML markup provider. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import QCoreApplication +from PyQt5.QtWidgets import QDialog, QInputDialog + +from .MarkupBase import MarkupBase + + +class HtmlProvider(MarkupBase): + """ + Class implementing the HTML markup provider. + """ + def __init__(self): + """ + Constructor + """ + super(HtmlProvider, self).__init__() + + def kind(self): + """ + Public method to get the markup kind. + + @return string with markup kind + @rtype str + """ + return "html" + + def hasBold(self): + """ + Public method to indicate the availability of bold markup. + + @return flag indicating the availability of bold markup + @rtype bool + """ + return True + + def bold(self, editor): + """ + Public method to generate bold text. + + @param editor reference to the editor to work on + @type Editor + """ + self.__insertMarkup("b", editor) + + def hasItalic(self): + """ + Public method to indicate the availability of italic markup. + + @return flag indicating the availability of italic markup + @rtype bool + """ + return True + + def italic(self, editor): + """ + Public method to generate italic text. + + @param editor reference to the editor to work on + @type Editor + """ + self.__insertMarkup("i", editor) + + def hasStrikethrough(self): + """ + Public method to indicate the availability of strikethrough markup. + + @return flag indicating the availability of strikethrough markup + @rtype bool + """ + return True + + def strikethrough(self, editor): + """ + Public method to generate strikethrough text. + + @param editor reference to the editor to work on + @type Editor + """ + self.__insertMarkup("del", editor) + + def headerLevels(self): + """ + Public method to determine the available header levels. + + @return supported header levels + @rtype int + """ + return 6 + + def header(self, editor, level): + """ + Public method to generate a header. + + @param editor reference to the editor to work on + @type Editor + @param level header level + @type int + """ + if level <= 6: + self.__insertMarkup("h{0}".format(level), editor) + + def hasCode(self): + """ + Public method to indicate the availability of inline code markup. + + @return flag indicating the availability of inline code markup + @rtype bool + """ + return True + + def code(self, editor): + """ + Public method to generate inline code text. + + @param editor reference to the editor to work on + @type Editor + """ + self.__insertMarkup("code", editor) + + def hasCodeBlock(self): + """ + Public method to indicate the availability of code block markup. + + @return flag indicating the availability of code block markup + @rtype bool + """ + return True + + def codeBlock(self, editor): + """ + Public method to generate code block text. + + @param editor reference to the editor to work on + @type Editor + """ + if editor is None: + return + + lineSeparator = editor.getLineSeparator() + editor.beginUndoAction() + if editor.hasSelectedText(): + newText = "<pre><code>{0}{1}</code></pre>{0}".format( + lineSeparator, editor.selectedText()) + editor.replaceSelectedText(newText) + else: + editor.insert("<pre><code>{0}{0}</code></pre>{0}".format( + lineSeparator)) + cline, cindex = editor.getCursorPosition() + editor.setCursorPosition(cline + 1, 0) + editor.endUndoAction() + + def __insertMarkup(self, markup, editor, addEol=False): + """ + Private method to insert the specified markup. + + If the editor has selected text, this text is enclosed by the given + markup. If no text is selected, the markup is inserted at the cursor + position and the cursor is positioned in between. + + @param markup markup string to be inserted + @type str + @param editor reference to the editor to work on + @type Editor + @param addEol flag indicating to add an eol string after the tag + @type bool + """ + if editor is None: + return + + if addEol: + lineSeparator = editor.getLineSeparator() + else: + lineSeparator = "" + editor.beginUndoAction() + if editor.hasSelectedText(): + newText = "<{0}>{2}{1}</{0}>{2}".format( + markup, editor.selectedText(), lineSeparator) + editor.replaceSelectedText(newText) + else: + editor.insert("<{0}>{1}{1}</{0}>{1}".format(markup, lineSeparator)) + cline, cindex = editor.getCursorPosition() + if addEol: + editor.setCursorPosition(cline + 1, 0) + else: + editor.setCursorPosition(cline, cindex + len(markup) + 2) + editor.endUndoAction() + + def hasHyperlink(self): + """ + Public method to indicate the availability of hyperlink markup. + + @return flag indicating the availability of hyperlink markup + @rtype bool + """ + return True + + def hyperlink(self, editor): + """ + Public method to generate hyperlink text. + + @param editor reference to the editor to work on + @type Editor + """ + if editor is None: + return + + from .HyperlinkMarkupDialog import HyperlinkMarkupDialog + dlg = HyperlinkMarkupDialog(True, False) + if dlg.exec_() == QDialog.Accepted: + text, target, title = dlg.getData() + if not text: + text = target + + if title: + link = '<a href="{0}" title="{2}">{1}</a>'.format( + target, text, title) + else: + link = '<a href="{0}">{1}</a>'.format(target, text) + + editor.beginUndoAction() + cline, cindex = editor.getCursorPosition() + editor.insert(link) + editor.setCursorPosition(cline, cindex + len(link)) + editor.endUndoAction() + + def hasLine(self): + """ + Public method to indicate the availability of a horizontal line markup. + + @return flag indicating the availability of a horizontal line markup + @rtype bool + """ + return True + + def line(self, editor): + """ + Public method to generate a horizontal line text. + + @param editor reference to the editor to work on + @type Editor + """ + if editor is None: + return + + editor.beginUndoAction() + markup = "<hr />" + editor.insert(markup) + cline, cindex = editor.getCursorPosition() + editor.setCursorPosition(cline, cindex + len(markup)) + editor.endUndoAction() + + def hasQuote(self): + """ + Public method to indicate the availability of block quote markup. + + @return flag indicating the availability of block quote markup + @rtype bool + """ + return True + + def quote(self, editor): + """ + Public method to generate block quote text. + + @param editor reference to the editor to work on + @type Editor + """ + self.__insertMarkup("blockquote", editor, True) + + def hasImage(self): + """ + Public method to indicate the availability of image markup. + + @return flag indicating the availability of image markup + @rtype bool + """ + return True + + def image(self, editor): + """ + Public method to generate image text. + + @param editor reference to the editor to work on + @type Editor + """ + if editor is None: + return + + from .ImageMarkupDialog import ImageMarkupDialog + dlg = ImageMarkupDialog(ImageMarkupDialog.HtmlMode) + if dlg.exec_() == QDialog.Accepted: + address, altText, title, originalSize, width, height = \ + dlg.getData() + + markup = '<img src="{0}"'.format(address) + if altText: + markup = '{0} alt="{1}"'.format(markup, altText) + if title: + markup = '{0} title="{1}"'.format(markup, title) + if not originalSize: + markup = '{0} width="{1}" height="{2}"'.format( + markup, width, height) + markup = '{0} />'.format(markup) + + editor.beginUndoAction() + editor.insert(markup) + cline, cindex = editor.getCursorPosition() + editor.setCursorPosition(cline, cindex + len(markup)) + editor.endUndoAction() + + def hasBulletedList(self): + """ + Public method to indicate the availability of bulleted list markup. + + @return flag indicating the availability of bulleted list markup + @rtype bool + """ + return True + + def bulletedList(self, editor): + """ + Public method to generate bulleted list text. + + @param editor reference to the editor to work on + @type Editor + """ + self.__makeList(editor, "ul") + + def hasNumberedList(self): + """ + Public method to indicate the availability of numbered list markup. + + @return flag indicating the availability of numbered list markup + @rtype bool + """ + return True + + def numberedList(self, editor): + """ + Public method to generate numbered list text. + + @param editor reference to the editor to work on + @type Editor + """ + self.__makeList(editor, "ol") + + def __makeList(self, editor, listType): + """ + Private method to generate the desired list markup. + + @param editor reference to the editor to work on + @type Editor + @param listType type of the desired list (should be ul or ol) + @type str + """ + if editor is None: + return + + lineSeparator = editor.getLineSeparator() + editor.beginUndoAction() + if editor.hasSelectedText(): + startLine, startIndex, endLine, endIndex = \ + editor.getSelection() + if endIndex == 0: + endLine -= 1 + for line in range(startLine, endLine + 1): + editor.insertAt("</li>", line, len(editor.text(line).rstrip())) + editor.insertAt(" <li>", line, 0) + if line == editor.lines() - 1: + editor.insertAt(lineSeparator, line, 1000) + editor.insertAt("</{1}>{0}".format(lineSeparator, listType), + endLine + 1, 0) + editor.insertAt("<{1}>{0}".format(lineSeparator, listType), + startLine, 0) + editor.setCursorPosition(endLine + 3, 0) + else: + listElements, ok = QInputDialog.getInt( + None, + QCoreApplication.translate( + "HtmlProvider", "Create List"), + QCoreApplication.translate( + "HtmlProvider", "Enter desired number of list elements:"), + 0, 0, 99, 1) + if ok: + if listElements == 0: + listElements = 1 + cline, cindex = editor.getCursorPosition() + listBody = \ + listElements * " <li></li>{0}".format(lineSeparator) + markup = "<{1}>{0}{2}</{1}>{0}".format( + lineSeparator, listType, listBody) + if cindex == 0: + editor.insertAt(markup, cline, cindex) + editor.setCursorPosition(cline + 1, 6) + else: + if cline == editor.lines() - 1: + editor.insertAt(lineSeparator, cline, 1000) + editor.insertAt(markup, cline + 1, 0) + editor.setCursorPosition(cline + 2, 6) + editor.endUndoAction()
diff -r 852016bbdedb -r c307358a2ecc QScintilla/MarkupProviders/HyperlinkMarkupDialog.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/QScintilla/MarkupProviders/HyperlinkMarkupDialog.py Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,92 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter data to insert a hyperlink. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox + +from .Ui_HyperlinkMarkupDialog import Ui_HyperlinkMarkupDialog + + +class HyperlinkMarkupDialog(QDialog, Ui_HyperlinkMarkupDialog): + """ + Class implementing a dialog to enter data to insert a hyperlink. + """ + def __init__(self, textMayBeEmpty, targetMayBeEmpty, noTitle=False, + parent=None): + """ + Constructor + + @param textMayBeEmpty flag indicating, that the link text may + be empty + @type bool + @param targetMayBeEmpty flag indicating, that the link target may + be empty + @type bool + @param noTitle flag indicating, that no title is supported + @type bool + @param parent reference to the parent widget + @type QWidget + """ + super(HyperlinkMarkupDialog, self).__init__(parent) + self.setupUi(self) + + self.__allowEmptyText = textMayBeEmpty + self.__allowEmptyTarget = targetMayBeEmpty + + self.titelEdit.setEnabled(not noTitle) + + self.__updateOkButton() + + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) + + def __updateOkButton(self): + """ + Private method to update the state of the OK button. + """ + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled( + (bool(self.textEdit.text()) or self.__allowEmptyText) and + (bool(self.targetEdit.text()) or self.__allowEmptyTarget) + ) + + @pyqtSlot(str) + def on_textEdit_textChanged(self, txt): + """ + Private slot handling a change of the link text. + + @param txt link text + @type str + """ + self.__updateOkButton() + + @pyqtSlot(str) + def on_targetEdit_textChanged(self, txt): + """ + Private slot handling a change of the link target. + + @param txt link target + @type str + """ + self.__updateOkButton() + + def getData(self): + """ + Public method to get the entered data. + + @return tuple containing the link text, link target and the optional + link title + @rtype tuple of (str, str, str) + """ + return ( + self.textEdit.text(), + self.targetEdit.text(), + self.titelEdit.text() + )
diff -r 852016bbdedb -r c307358a2ecc QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HyperlinkMarkupDialog</class> + <widget class="QDialog" name="HyperlinkMarkupDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>142</height> + </rect> + </property> + <property name="windowTitle"> + <string>Insert Hyperlink</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Link Text:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="textEdit"/> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Link Target:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="targetEdit"/> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Link Title:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLineEdit" name="titelEdit"/> + </item> + <item row="3" column="0" colspan="2"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>HyperlinkMarkupDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>HyperlinkMarkupDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui>
diff -r 852016bbdedb -r c307358a2ecc QScintilla/MarkupProviders/ImageMarkupDialog.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/QScintilla/MarkupProviders/ImageMarkupDialog.py Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,220 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter data for an image markup. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import pyqtSlot, QSize +from PyQt5.QtGui import QImage, QImageReader +from PyQt5.QtWidgets import QDialog, QDialogButtonBox + +from E5Gui.E5PathPicker import E5PathPickerModes + +from .Ui_ImageMarkupDialog import Ui_ImageMarkupDialog + + +class ImageMarkupDialog(QDialog, Ui_ImageMarkupDialog): + """ + Class implementing a dialog to enter data for an image markup. + """ + HtmlMode = 0 + MarkDownMode = 1 + RestMode = 2 + + def __init__(self, mode, parent=None): + """ + Constructor + + @param mode mode of the dialog + @type int + @param parent reference to the parent widget + @type QWidget + """ + super(ImageMarkupDialog, self).__init__(parent) + self.setupUi(self) + + if mode == ImageMarkupDialog.MarkDownMode: + self.sizeCheckBox.setEnabled(False) + self.aspectRatioCheckBox.setEnabled(False) + self.widthSpinBox.setEnabled(False) + self.heightSpinBox.setEnabled(False) + elif mode == ImageMarkupDialog.RestMode: + self.titleEdit.setEnabled(False) + + self.__mode = mode + self.__originalImageSize = QSize() + + filters = { + 'bmp': self.tr("Windows Bitmap File (*.bmp)"), + 'cur': self.tr("Windows Cursor File (*.cur)"), + 'dds': self.tr("DirectDraw-Surface File (*.dds)"), + 'gif': self.tr("Graphic Interchange Format File (*.gif)"), + 'icns': self.tr("Apple Icon File (*.icns)"), + 'ico': self.tr("Windows Icon File (*.ico)"), + 'jp2': self.tr("JPEG2000 File (*.jp2)"), + 'jpg': self.tr("JPEG File (*.jpg)"), + 'jpeg': self.tr("JPEG File (*.jpeg)"), + 'mng': self.tr("Multiple-Image Network Graphics File (*.mng)"), + 'pbm': self.tr("Portable Bitmap File (*.pbm)"), + 'pcx': self.tr("Paintbrush Bitmap File (*.pcx)"), + 'pgm': self.tr("Portable Graymap File (*.pgm)"), + 'png': self.tr("Portable Network Graphics File (*.png)"), + 'ppm': self.tr("Portable Pixmap File (*.ppm)"), + 'sgi': self.tr("Silicon Graphics Image File (*.sgi)"), + 'svg': self.tr("Scalable Vector Graphics File (*.svg)"), + 'svgz': self.tr("Compressed Scalable Vector Graphics File" + " (*.svgz)"), + 'tga': self.tr("Targa Graphic File (*.tga)"), + 'tif': self.tr("TIFF File (*.tif)"), + 'tiff': self.tr("TIFF File (*.tiff)"), + 'wbmp': self.tr("WAP Bitmap File (*.wbmp)"), + 'webp': self.tr("WebP Image File (*.webp)"), + 'xbm': self.tr("X11 Bitmap File (*.xbm)"), + 'xpm': self.tr("X11 Pixmap File (*.xpm)"), + } + + inputFormats = [] + readFormats = QImageReader.supportedImageFormats() + for readFormat in readFormats: + try: + inputFormats.append(filters[bytes(readFormat).decode()]) + except KeyError: + pass + inputFormats.sort() + inputFormats.append(self.tr("All Files (*)")) + if filters["png"] in inputFormats: + inputFormats.remove(filters["png"]) + inputFormats.insert(0, filters["png"]) + self.imagePicker.setFilters(';;'.join(inputFormats)) + self.imagePicker.setMode(E5PathPickerModes.OpenFileMode) + + self.sizeCheckBox.setChecked(True) + self.aspectRatioCheckBox.setChecked(True) + + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) + + self.__updateOkButton() + + def __updateOkButton(self): + """ + Private slot to set the state of the OK button. + """ + enable = bool(self.imagePicker.text()) + if self.__mode == ImageMarkupDialog.MarkDownMode: + enable = enable and bool(self.altTextEdit.text()) + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable) + + @pyqtSlot(str) + def on_imagePicker_textChanged(self, address): + """ + Private slot handling changes of the image path. + + @param address image address (URL or local path) + @type str + """ + if address and "://" not in address: + image = QImage(address) + # load the file to set the size spin boxes + if image.isNull(): + self.widthSpinBox.setValue(0) + self.heightSpinBox.setValue(0) + self.__originalImageSize = QSize() + self.__aspectRatio = 1 + else: + self.widthSpinBox.setValue(image.width()) + self.heightSpinBox.setValue(image.height()) + self.__originalImageSize = image.size() + self.__aspectRatio = \ + float(self.__originalImageSize.height()) / \ + self.__originalImageSize.width() + else: + self.widthSpinBox.setValue(0) + self.heightSpinBox.setValue(0) + self.__originalImageSize = QSize() + self.__aspectRatio = 1 + + self.__updateOkButton() + + @pyqtSlot(str) + def on_altTextEdit_textChanged(self, txt): + """ + Private slot handling changes of the alternative text. + + @param txt alternative text + @type str + """ + self.__updateOkButton() + + @pyqtSlot(bool) + def on_sizeCheckBox_toggled(self, checked): + """ + Private slot to reset the width and height spin boxes. + + @param checked flag indicating the state of the check box + @type bool + """ + if checked: + self.widthSpinBox.setValue(self.__originalImageSize.width()) + self.heightSpinBox.setValue(self.__originalImageSize.height()) + + @pyqtSlot(bool) + def on_aspectRatioCheckBox_toggled(self, checked): + """ + Private slot to adjust the height to match the original aspect ratio. + + @param checked flag indicating the state of the check box + @type bool + """ + if checked and self.__originalImageSize.isValid(): + height = self.widthSpinBox.value() * self.__aspectRatio + self.heightSpinBox.setValue(height) + + @pyqtSlot(int) + def on_widthSpinBox_valueChanged(self, width): + """ + Private slot to adjust the height spin box. + + @param width width for the image + @type int + """ + if self.aspectRatioCheckBox.isChecked() and \ + self.widthSpinBox.hasFocus(): + height = width * self.__aspectRatio + self.heightSpinBox.setValue(height) + + @pyqtSlot(int) + def on_heightSpinBox_valueChanged(self, height): + """ + Private slot to adjust the width spin box. + + @param height height for the image + @type int + """ + if self.aspectRatioCheckBox.isChecked() and \ + self.heightSpinBox.hasFocus(): + width = height / self.__aspectRatio + self.widthSpinBox.setValue(width) + + def getData(self): + """ + Public method to get the entered data. + + @return tuple containing the image address, alternative text, + title text, flag to keep the original size, width and height + @rtype tuple of (str, str, str, bool, int, int) + """ + return ( + self.imagePicker.text(), + self.altTextEdit.text(), + self.titleEdit.text(), + self.sizeCheckBox.isChecked(), + self.widthSpinBox.value(), + self.heightSpinBox.value(), + )
diff -r 852016bbdedb -r c307358a2ecc QScintilla/MarkupProviders/ImageMarkupDialog.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/QScintilla/MarkupProviders/ImageMarkupDialog.ui Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,253 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>ImageMarkupDialog</class> + <widget class="QDialog" name="ImageMarkupDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>500</width> + <height>231</height> + </rect> + </property> + <property name="windowTitle"> + <string>Add Image</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Image Address:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="E5PathPicker" name="imagePicker" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <property name="toolTip"> + <string>Enter the image path or URL</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>Title:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="titleEdit"/> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Alternative Text:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLineEdit" name="altTextEdit"/> + </item> + </layout> + </item> + <item> + <widget class="QCheckBox" name="sizeCheckBox"> + <property name="toolTip"> + <string/> + </property> + <property name="text"> + <string>Keep Original Size</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="aspectRatioCheckBox"> + <property name="text"> + <string>Keep Aspect Ratio</string> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Width:</string> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="widthSpinBox"> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="suffix"> + <string> px</string> + </property> + <property name="maximum"> + <number>9999</number> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Height:</string> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="heightSpinBox"> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="suffix"> + <string> px</string> + </property> + <property name="maximum"> + <number>9999</number> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <customwidgets> + <customwidget> + <class>E5PathPicker</class> + <extends>QWidget</extends> + <header>E5Gui/E5PathPicker.h</header> + <container>1</container> + </customwidget> + </customwidgets> + <tabstops> + <tabstop>imagePicker</tabstop> + <tabstop>titleEdit</tabstop> + <tabstop>altTextEdit</tabstop> + <tabstop>sizeCheckBox</tabstop> + <tabstop>aspectRatioCheckBox</tabstop> + <tabstop>widthSpinBox</tabstop> + <tabstop>heightSpinBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>ImageMarkupDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>228</x> + <y>179</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>200</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>ImageMarkupDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>296</x> + <y>185</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>200</y> + </hint> + </hints> + </connection> + <connection> + <sender>sizeCheckBox</sender> + <signal>toggled(bool)</signal> + <receiver>aspectRatioCheckBox</receiver> + <slot>setDisabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>62</x> + <y>51</y> + </hint> + <hint type="destinationlabel"> + <x>63</x> + <y>76</y> + </hint> + </hints> + </connection> + <connection> + <sender>sizeCheckBox</sender> + <signal>toggled(bool)</signal> + <receiver>widthSpinBox</receiver> + <slot>setDisabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>108</x> + <y>51</y> + </hint> + <hint type="destinationlabel"> + <x>105</x> + <y>103</y> + </hint> + </hints> + </connection> + <connection> + <sender>sizeCheckBox</sender> + <signal>toggled(bool)</signal> + <receiver>heightSpinBox</receiver> + <slot>setDisabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>221</x> + <y>53</y> + </hint> + <hint type="destinationlabel"> + <x>223</x> + <y>103</y> + </hint> + </hints> + </connection> + </connections> +</ui>
diff -r 852016bbdedb -r c307358a2ecc QScintilla/MarkupProviders/MarkdownProvider.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/QScintilla/MarkupProviders/MarkdownProvider.py Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,405 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the Markdown markup provider. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import QCoreApplication +from PyQt5.QtWidgets import QDialog, QInputDialog + +from .MarkupBase import MarkupBase + + +class MarkdownProvider(MarkupBase): + """ + Class implementing the Markdown markup provider. + """ + def __init__(self): + """ + Constructor + """ + super(MarkdownProvider, self).__init__() + + def kind(self): + """ + Public method to get the markup kind. + + @return string with markup kind + @rtype str + """ + return "markdown" + + def hasBold(self): + """ + Public method to indicate the availability of bold markup. + + @return flag indicating the availability of bold markup + @rtype bool + """ + return True + + def bold(self, editor): + """ + Public method to generate bold text. + + @param editor reference to the editor to work on + @type Editor + """ + self.__insertMarkup("**", editor) + + def hasItalic(self): + """ + Public method to indicate the availability of italic markup. + + @return flag indicating the availability of italic markup + @rtype bool + """ + return True + + def italic(self, editor): + """ + Public method to generate italic text. + + @param editor reference to the editor to work on + @type Editor + """ + self.__insertMarkup("_", editor) + + def hasStrikethrough(self): + """ + Public method to indicate the availability of strikethrough markup. + + @return flag indicating the availability of strikethrough markup + @rtype bool + """ + return True + + def strikethrough(self, editor): + """ + Public method to generate strikethrough text. + + @param editor reference to the editor to work on + @type Editor + """ + self.__insertMarkup("~~", editor) + + def headerLevels(self): + """ + Public method to determine the available header levels. + + @return supported header levels + @rtype int + """ + return 6 + + def header(self, editor, level): + """ + Public method to generate a header. + + @param editor reference to the editor to work on + @type Editor + @param level header level + @type int + """ + if editor is None or level > self.headerLevels(): + return + + editor.beginUndoAction() + cline, cindex = editor.getCursorPosition() + editor.insertAt(level * "#" + " ", cline, 0) + editor.setCursorPosition(cline, level + 1) + editor.endUndoAction() + + def hasCode(self): + """ + Public method to indicate the availability of inline code markup. + + @return flag indicating the availability of inline code markup + @rtype bool + """ + return True + + def code(self, editor): + """ + Public method to generate inline code text. + + @param editor reference to the editor to work on + @type Editor + """ + self.__insertMarkup("`", editor) + + def hasCodeBlock(self): + """ + Public method to indicate the availability of code block markup. + + @return flag indicating the availability of code block markup + @rtype bool + """ + return True + + def codeBlock(self, editor): + """ + Public method to generate code block text. + + @param editor reference to the editor to work on + @type Editor + """ + if editor is None: + return + + lineSeparator = editor.getLineSeparator() + editor.beginUndoAction() + if editor.hasSelectedText(): + newText = "```{0}{1}```{0}".format( + lineSeparator, editor.selectedText()) + editor.replaceSelectedText(newText) + else: + editor.insert("```{0}{0}```{0}".format(lineSeparator)) + cline, cindex = editor.getCursorPosition() + editor.setCursorPosition(cline + 1, 0) + editor.endUndoAction() + + def __insertMarkup(self, markup, editor): + """ + Private method to insert the specified markup. + + If the editor has selected text, this text is enclosed by the given + markup. If no text is selected, the markup is inserted at the cursor + position and the cursor is positioned in between. + + @param markup markup string to be inserted + @type str + @param editor reference to the editor to work on + @type Editor + """ + if editor is None: + return + + editor.beginUndoAction() + if editor.hasSelectedText(): + newText = "{0}{1}{0}".format(markup, editor.selectedText()) + editor.replaceSelectedText(newText) + else: + editor.insert(2 * markup) + cline, cindex = editor.getCursorPosition() + editor.setCursorPosition(cline, cindex + len(markup)) + editor.endUndoAction() + + def hasHyperlink(self): + """ + Public method to indicate the availability of hyperlink markup. + + @return flag indicating the availability of hyperlink markup + @rtype bool + """ + return True + + def hyperlink(self, editor): + """ + Public method to generate hyperlink text. + + @param editor reference to the editor to work on + @type Editor + """ + if editor is None: + return + + from .HyperlinkMarkupDialog import HyperlinkMarkupDialog + dlg = HyperlinkMarkupDialog(False, True) + if dlg.exec_() == QDialog.Accepted: + text, target, title = dlg.getData() + + link = "[{0}]".format(text) + if target and title: + link = '{0}({1} "{2}")'.format(link, target, title) + elif target: + link = '{0}({1})'.format(link, target) + elif title: + link = '{0}("{1}")'.format(link, title) + + editor.beginUndoAction() + cline, cindex = editor.getCursorPosition() + editor.insert(link) + editor.setCursorPosition(cline, cindex + len(link)) + editor.endUndoAction() + + def hasLine(self): + """ + Public method to indicate the availability of a horizontal line markup. + + @return flag indicating the availability of a horizontal line markup + @rtype bool + """ + return True + + def line(self, editor): + """ + Public method to generate a horizontal line text. + + @param editor reference to the editor to work on + @type Editor + """ + if editor is None: + return + + lineSeparator = editor.getLineSeparator() + editor.beginUndoAction() + markup = "{0}-----{0}{0}".format(lineSeparator) + editor.insert(markup) + cline, cindex = editor.getCursorPosition() + editor.setCursorPosition(cline + 3, 0) + editor.endUndoAction() + + def hasQuote(self): + """ + Public method to indicate the availability of block quote markup. + + @return flag indicating the availability of block quote markup + @rtype bool + """ + return True + + def quote(self, editor): + """ + Public method to generate block quote text. + + @param editor reference to the editor to work on + @type Editor + """ + if editor is None: + return + + editor.beginUndoAction() + markup = "> " + sline, sindex, eline, eindex = editor.getSelection() + for line in range(sline, eline + 1 if eindex > 0 else eline): + editor.insertAt(markup, line, 0) + editor.endUndoAction() + + def hasImage(self): + """ + Public method to indicate the availability of image markup. + + @return flag indicating the availability of image markup + @rtype bool + """ + return True + + def image(self, editor): + """ + Public method to generate image text. + + @param editor reference to the editor to work on + @type Editor + """ + if editor is None: + return + + from .ImageMarkupDialog import ImageMarkupDialog + dlg = ImageMarkupDialog(ImageMarkupDialog.MarkDownMode) + if dlg.exec_() == QDialog.Accepted: + address, altText, title, originalSize, width, height = \ + dlg.getData() + + if title: + markup = ''.format(altText, address, title) + else: + markup = ''.format(altText, address) + + editor.beginUndoAction() + editor.insert(markup) + cline, cindex = editor.getCursorPosition() + editor.setCursorPosition(cline, cindex + len(markup)) + editor.endUndoAction() + + def hasBulletedList(self): + """ + Public method to indicate the availability of bulleted list markup. + + @return flag indicating the availability of bulleted list markup + @rtype bool + """ + return True + + def bulletedList(self, editor): + """ + Public method to generate bulleted list text. + + @param editor reference to the editor to work on + @type Editor + """ + self.__makeList(editor, False) + + def hasNumberedList(self): + """ + Public method to indicate the availability of numbered list markup. + + @return flag indicating the availability of numbered list markup + @rtype bool + """ + return True + + def numberedList(self, editor): + """ + Public method to generate numbered list text. + + @param editor reference to the editor to work on + @type Editor + """ + self.__makeList(editor, True) + + def __makeList(self, editor, numberedList): + """ + Private method to generate the desired list markup. + + @param editor reference to the editor to work on + @type Editor + @param numberedList flag indicating the generation of a numbered list + @type bool + """ + if editor is None: + return + + if numberedList: + markup = " 1. " + else: + markup = " * " + lineSeparator = editor.getLineSeparator() + editor.beginUndoAction() + if editor.hasSelectedText(): + startLine, startIndex, endLine, endIndex = \ + editor.getSelection() + if endIndex == 0: + endLine -= 1 + for line in range(startLine, endLine + 1): + editor.insertAt(markup, line, 0) + editor.setCursorPosition(endLine + 1, 0) + else: + listElements, ok = QInputDialog.getInt( + None, + QCoreApplication.translate( + "MarkdownProvider", "Create List"), + QCoreApplication.translate( + "MarkdownProvider", + "Enter desired number of list elements:"), + 0, 0, 99, 1) + if ok: + if listElements == 0: + listElements = 1 + cline, cindex = editor.getCursorPosition() + listBody = \ + listElements * "{1}{0}".format(lineSeparator, markup) + if cindex == 0: + editor.insertAt(listBody, cline, cindex) + editor.setCursorPosition(cline, len(markup)) + else: + if cline == editor.lines() - 1: + editor.insertAt(lineSeparator, cline, 1000) + editor.insertAt(listBody, cline + 1, 0) + editor.setCursorPosition(cline + 1, len(markup)) + editor.endUndoAction()
diff -r 852016bbdedb -r c307358a2ecc QScintilla/MarkupProviders/MarkupBase.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/QScintilla/MarkupProviders/MarkupBase.py Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,252 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the base class for the markup providers. +""" + +from __future__ import unicode_literals + + +class MarkupBase(object): + """ + Class implementing the base class for the markup providers. + + Note: Derived classes need only implement those method they provide + functionality for. This base class implements do nothing variants for + all methods. + """ + def __init__(self): + """ + Constructor + """ + pass + + def kind(self): + """ + Public method to get the markup kind. + + @return markup kind all lowercased + @rtype str + """ + return "none" + + def hasBold(self): + """ + Public method to indicate the availability of bold markup. + + @return flag indicating the availability of bold markup + @rtype bool + """ + return False + + def bold(self, editor): + """ + Public method to generate bold text. + + @param editor reference to the editor to work on + @type Editor + """ + pass + + def hasItalic(self): + """ + Public method to indicate the availability of italic markup. + + @return flag indicating the availability of italic markup + @rtype bool + """ + return False + + def italic(self, editor): + """ + Public method to generate italic text. + + @param editor reference to the editor to work on + @type Editor + """ + pass + + def hasStrikethrough(self): + """ + Public method to indicate the availability of strikethrough markup. + + @return flag indicating the availability of strikethrough markup + @rtype bool + """ + return False + + def strikethrough(self, editor): + """ + Public method to generate strikethrough text. + + @param editor reference to the editor to work on + @type Editor + """ + pass + + def headerLevels(self): + """ + Public method to determine the available header levels. + + @return supported header levels + @rtype int + """ + return 0 + + def header(self, editor, level): + """ + Public method to generate a header. + + @param editor reference to the editor to work on + @type Editor + @param level header level + @type int + """ + pass + + def hasCode(self): + """ + Public method to indicate the availability of inline code markup. + + @return flag indicating the availability of inline code markup + @rtype bool + """ + return False + + def code(self, editor): + """ + Public method to generate inline code text. + + @param editor reference to the editor to work on + @type Editor + """ + pass + + def hasCodeBlock(self): + """ + Public method to indicate the availability of code block markup. + + @return flag indicating the availability of code block markup + @rtype bool + """ + return False + + def codeBlock(self, editor): + """ + Public method to generate code block text. + + @param editor reference to the editor to work on + @type Editor + """ + pass + + def hasHyperlink(self): + """ + Public method to indicate the availability of hyperlink markup. + + @return flag indicating the availability of hyperlink markup + @rtype bool + """ + return False + + def hyperlink(self, editor): + """ + Public method to generate hyperlink text. + + @param editor reference to the editor to work on + @type Editor + """ + pass + + def hasLine(self): + """ + Public method to indicate the availability of a horizontal line markup. + + @return flag indicating the availability of a horizontal line markup + @rtype bool + """ + return False + + def line(self, editor): + """ + Public method to generate a horizontal line text. + + @param editor reference to the editor to work on + @type Editor + """ + pass + + def hasQuote(self): + """ + Public method to indicate the availability of block quote markup. + + @return flag indicating the availability of block quote markup + @rtype bool + """ + return False + + def quote(self, editor): + """ + Public method to generate block quote text. + + @param editor reference to the editor to work on + @type Editor + """ + pass + + def hasImage(self): + """ + Public method to indicate the availability of image markup. + + @return flag indicating the availability of image markup + @rtype bool + """ + return False + + def image(self, editor): + """ + Public method to generate image text. + + @param editor reference to the editor to work on + @type Editor + """ + pass + + def hasBulletedList(self): + """ + Public method to indicate the availability of bulleted list markup. + + @return flag indicating the availability of bulleted list markup + @rtype bool + """ + return False + + def bulletedList(self, editor): + """ + Public method to generate bulleted list text. + + @param editor reference to the editor to work on + @type Editor + """ + pass + + def hasNumberedList(self): + """ + Public method to indicate the availability of numbered list markup. + + @return flag indicating the availability of numbered list markup + @rtype bool + """ + return False + + def numberedList(self, editor): + """ + Public method to generate numbered list text. + + @param editor reference to the editor to work on + @type Editor + """ + pass
diff -r 852016bbdedb -r c307358a2ecc QScintilla/MarkupProviders/RestructuredTextProvider.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/QScintilla/MarkupProviders/RestructuredTextProvider.py Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,433 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the reStructured Text markup provider. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import QCoreApplication +from PyQt5.QtWidgets import QDialog, QInputDialog + +from .MarkupBase import MarkupBase + + +class RestructuredTextProvider(MarkupBase): + """ + Class implementing the reStructured Text markup provider. + """ + def __init__(self): + """ + Constructor + """ + super(RestructuredTextProvider, self).__init__() + + self.__headerChars = ["=", "-", "~", "+", "#", "^"] + + def kind(self): + """ + Public method to get the markup kind. + + @return string with markup kind + @rtype str + """ + return "rest" + + def hasBold(self): + """ + Public method to indicate the availability of bold markup. + + @return flag indicating the availability of bold markup + @rtype bool + """ + return True + + def bold(self, editor): + """ + Public method to generate bold text. + + @param editor reference to the editor to work on + @type Editor + """ + self.__insertMarkup("**", editor) + + def hasItalic(self): + """ + Public method to indicate the availability of italic markup. + + @return flag indicating the availability of italic markup + @rtype bool + """ + return True + + def italic(self, editor): + """ + Public method to generate italic text. + + @param editor reference to the editor to work on + @type Editor + """ + self.__insertMarkup("*", editor) + + def headerLevels(self): + """ + Public method to determine the available header levels. + + @return supported header levels + @rtype int + """ + return len(self.__headerChars) + + def header(self, editor, level): + """ + Public method to generate a header. + + @param editor reference to the editor to work on + @type Editor + @param level header level + @type int + """ + if editor is None or level > self.headerLevels(): + return + + editor.beginUndoAction() + cline, cindex = editor.getCursorPosition() + if editor.hasSelection() and cindex == 0: + cline -= 1 + lineSeparator = editor.getLineSeparator() + if not editor.text(cline).endswith(lineSeparator): + editor.insertAt(lineSeparator, cline, len(editor.text(cline))) + lineLength = len(editor.text(cline)) - len(lineSeparator) + editor.insertAt( + lineLength * self.__headerChars[level - 1] + lineSeparator, + cline + 1, 0) + editor.setCursorPosition(cline + 2, 0) + editor.endUndoAction() + + def hasCode(self): + """ + Public method to indicate the availability of inline code markup. + + @return flag indicating the availability of inline code markup + @rtype bool + """ + return True + + def code(self, editor): + """ + Public method to generate inline code text. + + @param editor reference to the editor to work on + @type Editor + """ + self.__insertMarkup("``", editor) + + def hasCodeBlock(self): + """ + Public method to indicate the availability of code block markup. + + @return flag indicating the availability of code block markup + @rtype bool + """ + return True + + def codeBlock(self, editor): + """ + Public method to generate code block text. + + @param editor reference to the editor to work on + @type Editor + """ + if editor is None: + return + + lineSeparator = editor.getLineSeparator() + editor.beginUndoAction() + if editor.hasSelectedText(): + sline, sindex, eline, eindex = editor.getSelection() + if not editor.text(sline).startswith((" ", "\t")): + # assume that all selected lines need indentation, + # if first line needs it + endLine = eline if eindex > 0 else eline - 1 + for line in range(sline, endLine + 1): + editor.insertAt(" ", line, 0) + editor.insertAt("::{0}{0}".format(lineSeparator), sline, 0) + else: + editor.insert("::{0}{0} ".format(lineSeparator)) + cline, cindex = editor.getCursorPosition() + editor.setCursorPosition(cline + 2, 4) + editor.endUndoAction() + + def __insertMarkup(self, markup, editor): + """ + Private method to insert the specified markup. + + If the editor has selected text, this text is enclosed by the given + markup. If no text is selected, the markup is inserted at the cursor + position and the cursor is positioned in between. + + @param markup markup string to be inserted + @type str + @param editor reference to the editor to work on + @type Editor + """ + if editor is None: + return + + editor.beginUndoAction() + if editor.hasSelectedText(): + newText = "{0}{1}{0}".format(markup, editor.selectedText()) + editor.replaceSelectedText(newText) + else: + editor.insert(2 * markup) + cline, cindex = editor.getCursorPosition() + editor.setCursorPosition(cline, cindex + len(markup)) + editor.endUndoAction() + + def hasHyperlink(self): + """ + Public method to indicate the availability of hyperlink markup. + + @return flag indicating the availability of hyperlink markup + @rtype bool + """ + return True + + def hyperlink(self, editor): + """ + Public method to generate hyperlink text. + + @param editor reference to the editor to work on + @type Editor + """ + if editor is None: + return + + from .HyperlinkMarkupDialog import HyperlinkMarkupDialog + dlg = HyperlinkMarkupDialog(False, True, noTitle=True) + if dlg.exec_() == QDialog.Accepted: + text, target, _ = dlg.getData() + + link1 = "`{0}`_".format(text) + link2 = ".. _`{0}`:".format(text) + if target: + link2 = "{0} {1}".format(link2, target) + + lineSeparator = editor.getLineSeparator() + editor.beginUndoAction() + cline, cindex = editor.getCursorPosition() + editor.insert(link1) + + line = cline + while line < editor.lines(): + if editor.text(line).strip() == "": + # found end of block + break + line += 1 + if line == editor.lines(): + # reached end of document + editor.insertAt(2 * lineSeparator, line, 0) + editor.insertAt(link2, line + 2, 0) + else: + # find end of link block or start of next block + line += 1 + while line < editor.lines(): + if not editor.text(line).startswith(".. _"): + break + line += 1 + if editor.text(line).strip(): + sep = 2 * lineSeparator + else: + sep = lineSeparator + editor.insertAt("{0}{1}".format(link2, sep), line, 0) + + editor.setCursorPosition(cline, cindex + len(link1)) + editor.endUndoAction() + + def hasLine(self): + """ + Public method to indicate the availability of a horizontal line markup. + + @return flag indicating the availability of a horizontal line markup + @rtype bool + """ + return True + + def line(self, editor): + """ + Public method to generate a horizontal line text. + + @param editor reference to the editor to work on + @type Editor + """ + if editor is None: + return + + lineSeparator = editor.getLineSeparator() + editor.beginUndoAction() + markup = "{0}-----{0}{0}".format(lineSeparator) + editor.insert(markup) + cline, cindex = editor.getCursorPosition() + editor.setCursorPosition(cline + 3, 0) + editor.endUndoAction() + + def hasQuote(self): + """ + Public method to indicate the availability of block quote markup. + + @return flag indicating the availability of block quote markup + @rtype bool + """ + return True + + def quote(self, editor): + """ + Public method to generate block quote text. + + @param editor reference to the editor to work on + @type Editor + """ + if editor is None: + return + + lineSeparator = editor.getLineSeparator() + editor.beginUndoAction() + markup = "> " + sline, sindex, eline, eindex = editor.getSelection() + for line in range(sline, eline + 1 if eindex > 0 else eline): + editor.insertAt(markup, line, 0) + editor.insertAt("::{0}{0}".format(lineSeparator), sline, 0) + editor.setCursorPosition(eline + 2, eindex) + editor.endUndoAction() + + def hasImage(self): + """ + Public method to indicate the availability of image markup. + + @return flag indicating the availability of image markup + @rtype bool + """ + return True + + def image(self, editor): + """ + Public method to generate image text. + + @param editor reference to the editor to work on + @type Editor + """ + if editor is None: + return + + from .ImageMarkupDialog import ImageMarkupDialog + dlg = ImageMarkupDialog(ImageMarkupDialog.RestMode) + if dlg.exec_() == QDialog.Accepted: + address, altText, title, originalSize, width, height = \ + dlg.getData() + + lineSeparator = editor.getLineSeparator() + markup = ".. image:: {0}{1}".format(address, lineSeparator) + lines = 1 + if altText: + markup += " :alt: {0}{1}".format(altText, lineSeparator) + lines += 1 + if not originalSize: + markup += " :height: {0}px{1}".format(height, lineSeparator) + markup += " :width: {0}px{1}".format(width, lineSeparator) + lines += 2 + + editor.beginUndoAction() + editor.insert(markup) + cline, cindex = editor.getCursorPosition() + editor.setCursorPosition(cline + lines, 0) + editor.endUndoAction() + + def hasBulletedList(self): + """ + Public method to indicate the availability of bulleted list markup. + + @return flag indicating the availability of bulleted list markup + @rtype bool + """ + return True + + def bulletedList(self, editor): + """ + Public method to generate bulleted list text. + + @param editor reference to the editor to work on + @type Editor + """ + self.__makeList(editor, False) + + def hasNumberedList(self): + """ + Public method to indicate the availability of numbered list markup. + + @return flag indicating the availability of numbered list markup + @rtype bool + """ + return True + + def numberedList(self, editor): + """ + Public method to generate numbered list text. + + @param editor reference to the editor to work on + @type Editor + """ + self.__makeList(editor, True) + + def __makeList(self, editor, numberedList): + """ + Private method to generate the desired list markup. + + @param editor reference to the editor to work on + @type Editor + @param numberedList flag indicating the generation of a numbered list + @type bool + """ + if editor is None: + return + + if numberedList: + markup = " #. " + else: + markup = " * " + lineSeparator = editor.getLineSeparator() + editor.beginUndoAction() + if editor.hasSelectedText(): + startLine, startIndex, endLine, endIndex = \ + editor.getSelection() + if endIndex == 0: + endLine -= 1 + for line in range(startLine, endLine + 1): + editor.insertAt(markup, line, 0) + editor.setCursorPosition(endLine + 1, 0) + else: + listElements, ok = QInputDialog.getInt( + None, + QCoreApplication.translate( + "RestructuredTextProvider", "Create List"), + QCoreApplication.translate( + "RestructuredTextProvider", + "Enter desired number of list elements:"), + 0, 0, 99, 1) + if ok: + if listElements == 0: + listElements = 1 + cline, cindex = editor.getCursorPosition() + listBody = \ + listElements * "{1}{0}".format(lineSeparator, markup) + if cindex == 0: + editor.insertAt(listBody, cline, cindex) + editor.setCursorPosition(cline, len(markup)) + else: + if cline == editor.lines() - 1: + editor.insertAt(lineSeparator, cline, 1000) + editor.insertAt(listBody, cline + 1, 0) + editor.setCursorPosition(cline + 1, len(markup)) + editor.endUndoAction()
diff -r 852016bbdedb -r c307358a2ecc QScintilla/MarkupProviders/__init__.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/QScintilla/MarkupProviders/__init__.py Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,51 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2017 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Package providing various markup providers. +""" + +from __future__ import unicode_literals + +import os + +import Preferences + + +def getMarkupProvider(editor): + """ + Public method to get a markup provider for the given editor. + + @param editor reference to the editor to get the markup provider for + @type Editor + @return markup provider + @rtype MarkupBase + """ + if editor is not None: + fn = editor.getFileName() + + if fn: + extension = os.path.normcase(os.path.splitext(fn)[1][1:]) + else: + extension = "" + if extension in \ + Preferences.getEditor("PreviewHtmlFileNameExtensions") or \ + editor.getLanguage() == "HTML": + from .HtmlProvider import HtmlProvider + return HtmlProvider() + elif extension in \ + Preferences.getEditor("PreviewMarkdownFileNameExtensions") or \ + editor.getLanguage().lower() == "markdown": + from .MarkdownProvider import MarkdownProvider + return MarkdownProvider() + elif extension in \ + Preferences.getEditor("PreviewRestFileNameExtensions") or \ + editor.getLanguage().lower() == "restructuredtext": + from .RestructuredTextProvider import RestructuredTextProvider + return RestructuredTextProvider() + + # no supported markup provider identified + from .MarkupBase import MarkupBase + return MarkupBase()
diff -r 852016bbdedb -r c307358a2ecc README-MacOSX.rst --- a/README-MacOSX.rst Fri Jan 27 19:18:52 2017 +0100 +++ b/README-MacOSX.rst Fri Feb 03 19:20:59 2017 +0100 @@ -247,7 +247,7 @@ --------------------- Get Mercurial from -http://mercurial.selenic.com/ +http://www.mercurial-scm.org/ Extract the downloaded package and install it.
diff -r 852016bbdedb -r c307358a2ecc README-passive-debugging.rst --- a/README-passive-debugging.rst Fri Jan 27 19:18:52 2017 +0100 +++ b/README-passive-debugging.rst Fri Feb 03 19:20:59 2017 +0100 @@ -11,13 +11,12 @@ In order to enable passive mode debugging in the IDE choose the debugger tab of the preferences dialog and enable the passive mode debugging checkbox. You may change the default port as well. Please -be aware that you have to tell the debugger the port, if it is different to the -default value of 42424. +be aware that you have to tell the debugger the port, if it is different +to the default value of 42424. On the remote computer you have to have the debugger scripts installed. -Use DebugClient.py to debug normal scripts or DebugClientThreads.py -to debug multi threaded scripts. The debuggers know about the following -commandline switches. +Use DebugClient.py to debug normal and multi threaded scripts. The debugger +knows about the following commandline switches. :: @@ -47,9 +46,9 @@ python DebugClient -h somehost -- myscript.py param1 After the execution of the debugger command, it connects to the IDE and -tells it the filename of the script being debugged. The IDE will try to load it -and the script will stop at the first line. After that you may set breakpoints, -step through your script and use all the debugging functions. +tells it the filename of the script being debugged. The IDE will try to +load it and the script will stop at the first line. After that you may set +breakpoints, step through your script and use all the debugging functions. Note: The port and hostname may alternatively be set through the environment variables ERICPORT and ERICHOST.
diff -r 852016bbdedb -r c307358a2ecc README.rst --- a/README.rst Fri Jan 27 19:18:52 2017 +0100 +++ b/README.rst Fri Feb 03 19:20:59 2017 +0100 @@ -142,12 +142,9 @@ The remote login must be possible without any further interaction (i.e. no password prompt). If the remote setup differs from the local one you must configure the Python interpreter and the Debug Client to be used -in the Preferences dialog. eric6 includes two different versions of the -debug client. ``DebugClient.py`` is the traditional debugger and -``DebugClientThreads.py`` is a multithreading variant of the debug client. -Please copy all needed files to a place accessible through the Python path -of the remote machine and set the entries of the a.m. configuration tab -accordingly. +in the Preferences dialog. Use the ``install-debugclients.py`` script +to install the debug client files and set the entries of the a.m. +configuration page accordingly. To ease the installation process of the debug client, the eric6 sources include the script ``install-debugclients.py``. @@ -186,7 +183,7 @@ Mercurial This is a distributed version control system available from - <http://mercurial.selenic.com>. It is the one used by eric6 itself. + <http://www.mercurial-scm.org>. It is the one used by eric6 itself. Subversion This is a version control system available from
diff -r 852016bbdedb -r c307358a2ecc Templates/TemplatePropertiesDialog.py --- a/Templates/TemplatePropertiesDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Templates/TemplatePropertiesDialog.py Fri Feb 03 19:20:59 2017 +0100 @@ -59,12 +59,11 @@ self.groupMode = groupMode if groupMode: - langList = [] + self.groupLabel.setText(self.tr("Language:")) for lang, langDisp in self.languages: - langList.append(langDisp) - - self.groupLabel.setText(self.tr("Language:")) - self.groupCombo.addItems(langList) + self.groupCombo.addItem( + QScintilla.Lexers.getLanguageIcon(lang, False), + langDisp) self.templateLabel.setEnabled(False) self.templateEdit.setEnabled(False) self.templateEdit.setPlainText(self.tr("GROUP"))
diff -r 852016bbdedb -r c307358a2ecc Tools/TrayStarter.py --- a/Tools/TrayStarter.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Tools/TrayStarter.py Fri Feb 03 19:20:59 2017 +0100 @@ -506,9 +506,9 @@ from PyQt5.Qsci import QSCINTILLA_VERSION_STR try: - import sipconfig - sip_version_str = sipconfig.Configuration().sip_version_str - except ImportError: + import sip + sip_version_str = sip.SIP_VERSION_STR + except (ImportError, AttributeError): sip_version_str = "sip version not available" versionText = self.tr(
diff -r 852016bbdedb -r c307358a2ecc UI/EmailDialog.py --- a/UI/EmailDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ b/UI/EmailDialog.py Fri Feb 03 19:20:59 2017 +0100 @@ -281,10 +281,17 @@ @return flag indicating success (boolean) """ try: - server = smtplib.SMTP(Preferences.getUser("MailServer"), - Preferences.getUser("MailServerPort")) - if Preferences.getUser("MailServerUseTLS"): - server.starttls() + encryption = Preferences.getUser("MailServerEncryption") + if encryption == "SSL": + server = smtplib.SMTP_SSL( + Preferences.getUser("MailServer"), + Preferences.getUser("MailServerPort")) + else: + server = smtplib.SMTP( + Preferences.getUser("MailServer"), + Preferences.getUser("MailServerPort")) + if encryption == "TLS": + server.starttls() if Preferences.getUser("MailServerAuthentication"): # mail server needs authentication password = Preferences.getUser("MailServerPassword")
diff -r 852016bbdedb -r c307358a2ecc UI/Previewer.py --- a/UI/Previewer.py Fri Jan 27 19:18:52 2017 +0100 +++ b/UI/Previewer.py Fri Feb 03 19:20:59 2017 +0100 @@ -143,7 +143,7 @@ @return flag indicating if a preview can be shown (boolean) """ if editor: - if editor.getFileName() is not None: + if bool(editor.getFileName()): extension = os.path.normcase( os.path.splitext(editor.getFileName())[1][1:]) return extension in \ @@ -152,7 +152,8 @@ "PreviewMarkdownFileNameExtensions") + \ Preferences.getEditor("PreviewRestFileNameExtensions") + \ Preferences.getEditor("PreviewQssFileNameExtensions") - elif editor.getLanguage() in ["HTML", "QSS"]: + elif editor.getLanguage().lower() in [ + "html", "markdown", "restructuredtext", "qss"]: return True return False @@ -173,16 +174,19 @@ extension = "" if extension in \ Preferences.getEditor("PreviewHtmlFileNameExtensions") or \ - editor.getLanguage() == "HTML": + editor.getLanguage().lower() == "html": language = "HTML" elif extension in \ - Preferences.getEditor("PreviewMarkdownFileNameExtensions"): + Preferences.getEditor("PreviewMarkdownFileNameExtensions") or \ + editor.getLanguage().lower() == "markdown": language = "Markdown" elif extension in \ - Preferences.getEditor("PreviewRestFileNameExtensions"): + Preferences.getEditor("PreviewRestFileNameExtensions") or \ + editor.getLanguage().lower() == "restructuredtext": language = "ReST" elif extension in \ - Preferences.getEditor("PreviewQssFileNameExtensions"): + Preferences.getEditor("PreviewQssFileNameExtensions") or \ + editor.getLanguage().lower() == "qss": language = "QSS" else: language = ""
diff -r 852016bbdedb -r c307358a2ecc UI/Previewers/PreviewerHTML.py --- a/UI/Previewers/PreviewerHTML.py Fri Jan 27 19:18:52 2017 +0100 +++ b/UI/Previewers/PreviewerHTML.py Fri Feb 03 19:20:59 2017 +0100 @@ -164,13 +164,15 @@ extension = "" if extension in \ Preferences.getEditor("PreviewHtmlFileNameExtensions") or \ - editor.getLanguage() == "HTML": + editor.getLanguage() == "HTML": language = "HTML" elif extension in \ - Preferences.getEditor("PreviewMarkdownFileNameExtensions"): + Preferences.getEditor("PreviewMarkdownFileNameExtensions") or \ + editor.getLanguage().lower() == "markdown": language = "Markdown" elif extension in \ - Preferences.getEditor("PreviewRestFileNameExtensions"): + Preferences.getEditor("PreviewRestFileNameExtensions") or \ + editor.getLanguage().lower() == "restructuredtext": language = "ReST" else: self.__setHtml(fn, self.tr( @@ -186,10 +188,11 @@ else: rootPath = "" - self.__processingThread.process( - fn, language, editor.text(), - self.ssiCheckBox.isChecked(), rootPath, - Preferences.getEditor("PreviewRestUseSphinx")) + if bool(editor.text()): + self.__processingThread.process( + fn, language, editor.text(), + self.ssiCheckBox.isChecked(), rootPath, + Preferences.getEditor("PreviewRestUseSphinx")) def __setHtml(self, filePath, html): """ @@ -208,6 +211,8 @@ else: self.previewView.page().loadFinished.connect( self.__restoreScrollBarPositions) + if not filePath: + filePath = "/" self.previewView.setHtml(html, baseUrl=QUrl.fromLocalFile(filePath)) if self.__previewedEditor: self.__previewedEditor.setFocus() @@ -338,11 +343,6 @@ """ htmlReady = pyqtSignal(str, str) - DefaultStaticPath = os.path.join( - os.path.abspath(os.path.dirname(__file__)), 'sphinx_default') - StaticRegexp = re.compile(r'(src|href)=["\']_static([\s\w/\.]+?)["\']', - re.IGNORECASE) - def __init__(self, parent=None): """ Constructor @@ -537,13 +537,6 @@ fh.close() finally: shutil.rmtree(tempDir) - - # Replace the "_static/..." references inserted by Sphinx with absolute - # links to the specified DefaultStaticPath replacement. - def replace(m): - return '{0}="file://{1}{2}"'.format( - m.group(1), self.DefaultStaticPath, m.group(2)) - html = re.sub(self.StaticRegexp, replace, html) return html @@ -591,7 +584,8 @@ except ImportError: return self.tr( """<p>Markdown preview requires the <b>python-markdown</b> """ - """package.<br/>Install it with your package manager or see """ + """package.<br/>Install it with your package manager,""" + """ 'pip install docutils' or see """ """<a href="http://pythonhosted.org/Markdown/install.html">""" """installation instructions.</a></p>""")
diff -r 852016bbdedb -r c307358a2ecc UI/UserInterface.py --- a/UI/UserInterface.py Fri Jan 27 19:18:52 2017 +0100 +++ b/UI/UserInterface.py Fri Feb 03 19:20:59 2017 +0100 @@ -3086,9 +3086,9 @@ Private slot to handle the Versions dialog. """ try: - import sipconfig - sip_version_str = sipconfig.Configuration().sip_version_str - except ImportError: + import sip + sip_version_str = sip.SIP_VERSION_STR + except (ImportError, AttributeError): sip_version_str = "sip version not available" versionText = self.tr(
diff -r 852016bbdedb -r c307358a2ecc Utilities/__init__.py --- a/Utilities/__init__.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Utilities/__init__.py Fri Feb 03 19:20:59 2017 +0100 @@ -1006,7 +1006,7 @@ cur_path = os.path.join(os.curdir, filename) if os.path.exists(cur_path): if os.access(cur_path, os.X_OK): - return cur_path + return os.path.abspath(cur_path) path = os.getenv('PATH')
diff -r 852016bbdedb -r c307358a2ecc VCS/ProjectBrowserHelper.py --- a/VCS/ProjectBrowserHelper.py Fri Jan 27 19:18:52 2017 +0100 +++ b/VCS/ProjectBrowserHelper.py Fri Feb 03 19:20:59 2017 +0100 @@ -311,12 +311,8 @@ Protected slot called by the context menu to show the VCS log of a file/directory. """ - itm = self.browser.currentItem() - try: - fn = itm.fileName() - except AttributeError: - fn = itm.dirName() - self.vcs.vcsLog(fn) + # kept for backward compatibility for plug-ins + self._VCSLogBrowser() def _VCSLogBrowser(self): """
diff -r 852016bbdedb -r c307358a2ecc VCS/ProjectHelper.py --- a/VCS/ProjectHelper.py Fri Jan 27 19:18:52 2017 +0100 +++ b/VCS/ProjectHelper.py Fri Feb 03 19:20:59 2017 +0100 @@ -488,7 +488,8 @@ """ Protected slot used to show the log of the local project. """ - self.vcs.vcsLog(self.project.ppath) + # kept for backward compatibility for plug-ins + self._vcsLogBrowser() def _vcsLogBrowser(self): """
diff -r 852016bbdedb -r c307358a2ecc VCS/VersionControl.py --- a/VCS/VersionControl.py Fri Jan 27 19:18:52 2017 +0100 +++ b/VCS/VersionControl.py Fri Feb 03 19:20:59 2017 +0100 @@ -244,16 +244,6 @@ """ raise RuntimeError('Not implemented') - def vcsLog(self, name): - """ - Public method used to view the log of a file/directory in the vcs. - - @param name file/directory name to show the log for (string) - @exception RuntimeError to indicate that this method must be - implemented by a subclass - """ - raise RuntimeError('Not implemented') - def vcsLogBrowser(self, name, isFile=False): """ Public method used to view the log of a file/directory in the vcs
diff -r 852016bbdedb -r c307358a2ecc WebBrowser/QtHelp/QtHelpDocumentationDialog.py --- a/WebBrowser/QtHelp/QtHelpDocumentationDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ b/WebBrowser/QtHelp/QtHelpDocumentationDialog.py Fri Feb 03 19:20:59 2017 +0100 @@ -85,8 +85,10 @@ """ from .QtHelpDocumentationSelectionDialog import \ QtHelpDocumentationSelectionDialog - dlg = QtHelpDocumentationSelectionDialog(self.__pluginHelpDocuments, - self) + dlg = QtHelpDocumentationSelectionDialog( + self.__pluginHelpDocuments, + QtHelpDocumentationSelectionDialog.AddMode, + self) if dlg.exec_() == QDialog.Accepted: documents = dlg.getData() if not documents: @@ -94,6 +96,19 @@ self.__registerDocumentations(documents) + @pyqtSlot() + def on_managePluginButton_clicked(self): + """ + Private slot to manage the QtHelp documents provided by plug-ins. + """ + from .QtHelpDocumentationSelectionDialog import \ + QtHelpDocumentationSelectionDialog + dlg = QtHelpDocumentationSelectionDialog( + self.__pluginHelpDocuments, + QtHelpDocumentationSelectionDialog.ManageMode, + self) + dlg.exec_() + def __registerDocumentations(self, fileNames): """ Private method to register a given list of documentations.
diff -r 852016bbdedb -r c307358a2ecc WebBrowser/QtHelp/QtHelpDocumentationDialog.ui --- a/WebBrowser/QtHelp/QtHelpDocumentationDialog.ui Fri Jan 27 19:18:52 2017 +0100 +++ b/WebBrowser/QtHelp/QtHelpDocumentationDialog.ui Fri Feb 03 19:20:59 2017 +0100 @@ -26,7 +26,7 @@ </item> <item> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0" rowspan="4"> + <item row="0" column="0" rowspan="6"> <widget class="QListWidget" name="documentsList"> <property name="alternatingRowColors"> <bool>true</bool> @@ -49,6 +49,16 @@ </property> </widget> </item> + <item row="1" column="1"> + <widget class="QPushButton" name="addPluginButton"> + <property name="toolTip"> + <string>Press to select QtHelp documents provided by a plug-in to add to the database</string> + </property> + <property name="text"> + <string>Add from Plug-ins...</string> + </property> + </widget> + </item> <item row="2" column="1"> <widget class="QPushButton" name="removeButton"> <property name="toolTip"> @@ -60,6 +70,26 @@ </widget> </item> <item row="3" column="1"> + <widget class="Line" name="line"> + <property name="lineWidth"> + <number>2</number> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item row="4" column="1"> + <widget class="QPushButton" name="managePluginButton"> + <property name="toolTip"> + <string>Select to manage the plug-in provided documentation sets</string> + </property> + <property name="text"> + <string>Manage Plug-ins...</string> + </property> + </widget> + </item> + <item row="5" column="1"> <spacer name="verticalSpacer"> <property name="orientation"> <enum>Qt::Vertical</enum> @@ -67,21 +97,11 @@ <property name="sizeHint" stdset="0"> <size> <width>20</width> - <height>98</height> + <height>17</height> </size> </property> </spacer> </item> - <item row="1" column="1"> - <widget class="QPushButton" name="addPluginButton"> - <property name="toolTip"> - <string>Press to select QtHelp documents provided by a plug-in to add to the database</string> - </property> - <property name="text"> - <string>Add from Plug-ins...</string> - </property> - </widget> - </item> </layout> </item> <item>
diff -r 852016bbdedb -r c307358a2ecc WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py --- a/WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ b/WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py Fri Feb 03 19:20:59 2017 +0100 @@ -9,11 +9,18 @@ """ from __future__ import unicode_literals +try: + str = unicode +except NameError: + pass import os +import shutil -from PyQt5.QtCore import Qt -from PyQt5.QtWidgets import QDialog, QTreeWidgetItem +from PyQt5.QtCore import pyqtSlot, Qt +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem + +from E5Gui import E5MessageBox from .Ui_QtHelpDocumentationSelectionDialog import \ Ui_QtHelpDocumentationSelectionDialog @@ -25,26 +32,140 @@ Class implementing a dialog to select QtHelp documentation sets to be installed. """ - def __init__(self, helpDocuments, parent=None): + AddMode = "Add" + ManageMode = "Manage" + + def __init__(self, helpDocuments, mode, parent=None): """ Constructor @param helpDocuments dictionary containing the lists of help documents to be shown @type dict of lists of str + @param mode mode of the dialog + @type str @param parent reference to the parent widget @type QWidget """ super(QtHelpDocumentationSelectionDialog, self).__init__(parent) self.setupUi(self) + if mode == QtHelpDocumentationSelectionDialog.AddMode: + self.buttonBox.button(QDialogButtonBox.Close).hide() + else: + self.buttonBox.button(QDialogButtonBox.Ok).hide() + self.buttonBox.button(QDialogButtonBox.Cancel).hide() + for category in helpDocuments: parentItem = QTreeWidgetItem(self.documentationList, [category]) for document in helpDocuments[category]: item = QTreeWidgetItem(parentItem, [os.path.basename(document)]) item.setData(0, Qt.UserRole, document) + parentItem.setData(0, Qt.UserRole, os.path.dirname(document)) self.documentationList.sortItems(0, Qt.AscendingOrder) + + self.on_documentationList_itemSelectionChanged() + + @pyqtSlot() + def on_documentationList_itemSelectionChanged(self): + """ + Private slot handling the selection of items. + """ + selectedCategoriesCount = 0 + selectedDocumentSetCount = 0 + for itm in self.documentationList.selectedItems(): + if itm.parent() is None: + selectedCategoriesCount += 1 + else: + selectedDocumentSetCount += 1 + + self.deleteButton.setEnabled(selectedDocumentSetCount > 0) + self.deleteCategoryButton.setEnabled(selectedCategoriesCount > 0) + + @pyqtSlot() + def on_deleteButton_clicked(self): + """ + Private slot to delete the selected documentation sets. + """ + yes = E5MessageBox.yesNo( + self, + self.tr("Delete Documentation Sets"), + self.tr("""Shall the selected documentation sets really be""" + """ deleted?""")) + if yes: + for itm in self.documentationList.selectedItems(): + if itm.parent is None: + # it is a category item, skip it + continue + + category = itm.parent() + fileName = itm.data(0, Qt.UserRole) + try: + os.remove(fileName) + except OSError as err: + E5MessageBox.warning( + self, + self.tr("Delete Documentation Sets"), + self.tr("""<p>The documentation set <b>{0}</b> could""" + """ not be deleted.</p><p>Reason: {1}</p>""") + .format(fileName, str(err))) + continue + + category.removeChild(itm) + del itm + + if category.childCount() == 0: + self.__deleteCategory(category) + + @pyqtSlot() + def on_deleteCategoryButton_clicked(self): + """ + Private slot to delete the selected documentation set categories. + """ + yes = E5MessageBox.yesNo( + self, + self.tr("Delete Documentation Sets"), + self.tr("""Shall the selected documentation set categories""" + """ really be deleted?""")) + if yes: + categories = [] + for itm in self.documentationList.selectedItems(): + if itm.parent() is None: + categories.append(itm) + for category in categories: + self.__deleteCategory(category) + + @pyqtSlot() + def on_deleteAllButton_clicked(self): + """ + Private slot to delete all documentation sets. + """ + yes = E5MessageBox.yesNo( + self, + self.tr("Delete Documentation Sets"), + self.tr("""Shall all documentation sets really be deleted?""")) + if yes: + categories = [] + for index in range(self.documentationList.topLevelItemCount()): + categories.append( + self.documentationList.topLevelItem(index)) + for category in categories: + self.__deleteCategory(category) + + def __deleteCategory(self, category): + """ + Private method to delete a category. + + @param category reference to the category item + @type QTreeWidgetItem + """ + categoryDir = category.data(0, Qt.UserRole) + shutil.rmtree(categoryDir, True) + + self.documentationList.takeTopLevelItem( + self.documentationList.indexOfTopLevelItem(category)) + del category def getData(self): """
diff -r 852016bbdedb -r c307358a2ecc WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui --- a/WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui Fri Jan 27 19:18:52 2017 +0100 +++ b/WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui Fri Feb 03 19:20:59 2017 +0100 @@ -49,17 +49,70 @@ </widget> </item> <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QPushButton" name="deleteButton"> + <property name="toolTip"> + <string>Press to delete the selected documentation sets</string> + </property> + <property name="text"> + <string>Delete</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="deleteCategoryButton"> + <property name="toolTip"> + <string>Press to delete the selected category</string> + </property> + <property name="text"> + <string>Delete Categories</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="deleteAllButton"> + <property name="toolTip"> + <string>Press to delete all entries</string> + </property> + <property name="text"> + <string>Delete All</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close|QDialogButtonBox::Ok</set> </property> </widget> </item> </layout> </widget> + <tabstops> + <tabstop>documentationList</tabstop> + <tabstop>deleteButton</tabstop> + <tabstop>deleteCategoryButton</tabstop> + <tabstop>deleteAllButton</tabstop> + </tabstops> <resources/> <connections> <connection>
diff -r 852016bbdedb -r c307358a2ecc changelog --- a/changelog Fri Jan 27 19:18:52 2017 +0100 +++ b/changelog Fri Feb 03 19:20:59 2017 +0100 @@ -1,5 +1,29 @@ Change Log ---------- +Version 17.02: +- bug fixes +- Checkers + -- upgraded pycodestyle to version 2.2.0+ +- Debugger + -- changed the variables filter dialog to be more user friendly +- Editor + -- added a bar with formatting options for HTML, Markdown and reStructured + Text files + -- added support for the new QScintilla JSON lexer + -- added support for the new QScintilla Markdown lexer +- Email + -- added capability to use the SSL encryption method (next to StartTLS) in + the built in Email dialog +- Mercurial Interface + -- added clickable links to the log browser details pane + -- added up and down buttons to move the current entry to the log browser + -- added the capability to configure the length of the log message shown + in the message column of the log browser list +- Subversion interface + -- added up and down buttons to move the current entry to the log browser +- Web Browser + -- added functionality to manage the plug-in provided documentation sets + Version 17.01: - bug fixes - General
diff -r 852016bbdedb -r c307358a2ecc eric6.e4p --- a/eric6.e4p Fri Jan 27 19:18:52 2017 +0100 +++ b/eric6.e4p Fri Feb 03 19:20:59 2017 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE Project SYSTEM "Project-5.1.dtd"> <!-- eric project file for project eric6 --> -<!-- Copyright (C) 2016 Detlev Offenbach, detlev@die-offenbachs.de --> +<!-- Copyright (C) 2017 Detlev Offenbach, detlev@die-offenbachs.de --> <Project version="5.1"> <Language>en_US</Language> <ProjectWordList>Dictionaries/words.dic</ProjectWordList> @@ -558,9 +558,7 @@ <Source>Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py</Source> - <Source>Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py</Source> - <Source>Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgOptionsDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py</Source> @@ -644,7 +642,6 @@ <Source>Plugins/VcsPlugins/vcsPySvn/SvnDiffHighlighter.py</Source> <Source>Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py</Source> <Source>Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py</Source> - <Source>Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py</Source> <Source>Plugins/VcsPlugins/vcsPySvn/SvnLoginDialog.py</Source> <Source>Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py</Source> <Source>Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py</Source> @@ -678,7 +675,6 @@ <Source>Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py</Source> <Source>Plugins/VcsPlugins/vcsSubversion/SvnDiffHighlighter.py</Source> <Source>Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py</Source> - <Source>Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py</Source> <Source>Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py</Source> <Source>Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py</Source> <Source>Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py</Source> @@ -833,6 +829,7 @@ <Source>QScintilla/APIsManager.py</Source> <Source>QScintilla/Editor.py</Source> <Source>QScintilla/EditorAssembly.py</Source> + <Source>QScintilla/EditorButtonsWidget.py</Source> <Source>QScintilla/EditorMarkerMap.py</Source> <Source>QScintilla/Exporters/ExporterBase.py</Source> <Source>QScintilla/Exporters/ExporterHTML.py</Source> @@ -858,10 +855,12 @@ <Source>QScintilla/Lexers/LexerFortran77.py</Source> <Source>QScintilla/Lexers/LexerHTML.py</Source> <Source>QScintilla/Lexers/LexerIDL.py</Source> + <Source>QScintilla/Lexers/LexerJSON.py</Source> <Source>QScintilla/Lexers/LexerJava.py</Source> <Source>QScintilla/Lexers/LexerJavaScript.py</Source> <Source>QScintilla/Lexers/LexerLua.py</Source> <Source>QScintilla/Lexers/LexerMakefile.py</Source> + <Source>QScintilla/Lexers/LexerMarkdown.py</Source> <Source>QScintilla/Lexers/LexerMatlab.py</Source> <Source>QScintilla/Lexers/LexerOctave.py</Source> <Source>QScintilla/Lexers/LexerPO.py</Source> @@ -881,6 +880,13 @@ <Source>QScintilla/Lexers/LexerXML.py</Source> <Source>QScintilla/Lexers/LexerYAML.py</Source> <Source>QScintilla/Lexers/__init__.py</Source> + <Source>QScintilla/MarkupProviders/HtmlProvider.py</Source> + <Source>QScintilla/MarkupProviders/HyperlinkMarkupDialog.py</Source> + <Source>QScintilla/MarkupProviders/ImageMarkupDialog.py</Source> + <Source>QScintilla/MarkupProviders/MarkdownProvider.py</Source> + <Source>QScintilla/MarkupProviders/MarkupBase.py</Source> + <Source>QScintilla/MarkupProviders/RestructuredTextProvider.py</Source> + <Source>QScintilla/MarkupProviders/__init__.py</Source> <Source>QScintilla/MiniEditor.py</Source> <Source>QScintilla/Printer.py</Source> <Source>QScintilla/QsciScintillaCompat.py</Source> @@ -1633,7 +1639,6 @@ <Form>Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui</Form> - <Form>Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui</Form> @@ -1680,7 +1685,6 @@ <Form>Plugins/VcsPlugins/vcsPySvn/SvnDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.ui</Form> - <Form>Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsPySvn/SvnLoginDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui</Form> @@ -1705,7 +1709,6 @@ <Form>Plugins/VcsPlugins/vcsSubversion/SvnDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui</Form> - <Form>Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui</Form> @@ -1819,6 +1822,8 @@ <Form>PyUnit/UnittestDialog.ui</Form> <Form>PyUnit/UnittestStacktraceDialog.ui</Form> <Form>QScintilla/GotoDialog.ui</Form> + <Form>QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui</Form> + <Form>QScintilla/MarkupProviders/ImageMarkupDialog.ui</Form> <Form>QScintilla/ReplaceWidget.ui</Form> <Form>QScintilla/SearchWidget.ui</Form> <Form>QScintilla/ShellHistoryDialog.ui</Form> @@ -1968,7 +1973,6 @@ <Other>Dictionaries</Other> <Other>Documentation/Help</Other> <Other>Documentation/Source</Other> - <Other>Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html</Other> <Other>Documentation/eric6-plugin.odt</Other> <Other>Documentation/eric6-plugin.pdf</Other> <Other>Documentation/mod_python.odt</Other> @@ -2022,7 +2026,6 @@ <Other>Plugins/VcsPlugins/vcsMercurial/icons/startServer.png</Other> <Other>Plugins/VcsPlugins/vcsMercurial/icons/stopServer.png</Other> <Other>Plugins/VcsPlugins/vcsMercurial/templates/logBrowserBookmarkPhase.tmpl</Other> - <Other>Plugins/VcsPlugins/vcsMercurial/templates/logDialogBookmarkPhase.tmpl</Other> <Other>Plugins/VcsPlugins/vcsPySvn/icons/preferences-subversion.png</Other> <Other>Plugins/VcsPlugins/vcsPySvn/icons/pysvn.png</Other> <Other>Plugins/VcsPlugins/vcsSubversion/icons/preferences-subversion.png</Other>
diff -r 852016bbdedb -r c307358a2ecc eric6.py --- a/eric6.py Fri Jan 27 19:18:52 2017 +0100 +++ b/eric6.py Fri Feb 03 19:20:59 2017 +0100 @@ -310,7 +310,7 @@ pluginFile = None noopen = False nocrash = False - disablecrash=False + disablecrash = False if "--no-open" in sys.argv and sys.argv.index("--no-open") < ddindex: del sys.argv[sys.argv.index("--no-open")] noopen = True
diff -r 852016bbdedb -r c307358a2ecc i18n/eric6_cs.ts --- a/i18n/eric6_cs.ts Fri Jan 27 19:18:52 2017 +0100 +++ b/i18n/eric6_cs.ts Fri Feb 03 19:20:59 2017 +0100 @@ -3579,147 +3579,147 @@ <context> <name>CodeStyleFixer</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="494"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> <source>Triple single quotes converted to triple double quotes.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> - <source>Introductory quotes corrected to be {0}"""</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="500"/> - <source>Single line docstring put on one line.</source> + <source>Introductory quotes corrected to be {0}"""</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="503"/> + <source>Single line docstring put on one line.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="506"/> <source>Period added to summary line.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> <source>Blank line before function/method docstring removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="509"/> - <source>Blank line inserted before class docstring.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="512"/> - <source>Blank line inserted after class docstring.</source> + <source>Blank line inserted before class docstring.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="515"/> - <source>Blank line inserted after docstring summary.</source> + <source>Blank line inserted after class docstring.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="518"/> - <source>Blank line inserted after last paragraph of docstring.</source> + <source>Blank line inserted after docstring summary.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="521"/> - <source>Leading quotes put on separate line.</source> + <source>Blank line inserted after last paragraph of docstring.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="524"/> - <source>Trailing quotes put on separate line.</source> + <source>Leading quotes put on separate line.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="527"/> + <source>Trailing quotes put on separate line.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> <source>Blank line before class docstring removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> - <source>Blank line after class docstring removed.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="536"/> - <source>Blank line after function/method docstring removed.</source> + <source>Blank line after class docstring removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="539"/> - <source>Blank line after last paragraph removed.</source> + <source>Blank line after function/method docstring removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="542"/> - <source>Tab converted to 4 spaces.</source> + <source>Blank line after last paragraph removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="545"/> - <source>Indentation adjusted to be a multiple of four.</source> + <source>Tab converted to 4 spaces.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="548"/> - <source>Indentation of continuation line corrected.</source> + <source>Indentation adjusted to be a multiple of four.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="551"/> - <source>Indentation of closing bracket corrected.</source> + <source>Indentation of continuation line corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="554"/> - <source>Missing indentation of continuation line corrected.</source> + <source>Indentation of closing bracket corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="557"/> - <source>Closing bracket aligned to opening bracket.</source> + <source>Missing indentation of continuation line corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="560"/> - <source>Indentation level changed.</source> + <source>Closing bracket aligned to opening bracket.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="563"/> - <source>Indentation level of hanging indentation changed.</source> + <source>Indentation level changed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="566"/> + <source>Indentation level of hanging indentation changed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="569"/> <source>Visual indentation corrected.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="584"/> + <source>Extraneous whitespace removed.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="581"/> - <source>Extraneous whitespace removed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="578"/> <source>Missing whitespace added.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="584"/> - <source>Whitespace around comment sign corrected.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="587"/> + <source>Whitespace around comment sign corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="590"/> <source>One blank line inserted.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="591"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> <source>%n blank line(s) inserted.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -3728,7 +3728,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="597"/> <source>%n superfluous lines removed</source> <translation type="unfinished"> <numerusform></numerusform> @@ -3737,77 +3737,77 @@ </translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="598"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="601"/> <source>Superfluous blank lines removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="601"/> - <source>Superfluous blank lines after function decorator removed.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="604"/> - <source>Imports were put on separate lines.</source> + <source>Superfluous blank lines after function decorator removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="607"/> - <source>Long lines have been shortened.</source> + <source>Imports were put on separate lines.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="610"/> + <source>Long lines have been shortened.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="613"/> <source>Redundant backslash in brackets removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="616"/> - <source>Compound statement corrected.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="619"/> - <source>Comparison to None/True/False corrected.</source> + <source>Compound statement corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="622"/> - <source>'{0}' argument added.</source> + <source>Comparison to None/True/False corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="625"/> - <source>'{0}' argument removed.</source> + <source>'{0}' argument added.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="628"/> - <source>Whitespace stripped from end of line.</source> + <source>'{0}' argument removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="631"/> - <source>newline added to end of file.</source> + <source>Whitespace stripped from end of line.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="634"/> - <source>Superfluous trailing blank lines removed from end of file.</source> + <source>newline added to end of file.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="637"/> + <source>Superfluous trailing blank lines removed from end of file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="640"/> <source>'<>' replaced by '!='.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="641"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="644"/> <source>Could not save the file! Skipping it. Reason: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="710"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="713"/> <source> no message defined for code '{0}'</source> <translation type="unfinished"></translation> </message> @@ -7294,197 +7294,197 @@ <context> <name>DocStyleChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="260"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="263"/> <source>module is missing a docstring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="262"/> - <source>public function/method is missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="265"/> - <source>private function/method may be missing a docstring</source> + <source>public function/method is missing a docstring</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="268"/> + <source>private function/method may be missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="271"/> <source>public class is missing a docstring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="270"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="273"/> <source>private class may be missing a docstring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="272"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="275"/> <source>docstring not surrounded by """</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="274"/> - <source>docstring containing \ not surrounded by r"""</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="277"/> - <source>docstring containing unicode character not surrounded by u"""</source> + <source>docstring containing \ not surrounded by r"""</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="280"/> + <source>docstring containing unicode character not surrounded by u"""</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="283"/> <source>one-liner docstring on multiple lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="282"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="285"/> <source>docstring has wrong indentation</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="328"/> + <source>docstring summary does not end with a period</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="291"/> + <source>docstring summary is not in imperative mood (Does instead of Do)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="295"/> + <source>docstring summary looks like a function's/method's signature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="298"/> + <source>docstring does not mention the return value type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="301"/> + <source>function/method docstring is separated by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="304"/> + <source>class docstring is not preceded by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="307"/> + <source>class docstring is not followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="362"/> + <source>docstring summary is not followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="313"/> + <source>last paragraph of docstring is not followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="317"/> + <source>private function/method is missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="320"/> + <source>private class is missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="322"/> + <source>leading quotes of docstring not on separate line</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="325"/> - <source>docstring summary does not end with a period</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="288"/> - <source>docstring summary is not in imperative mood (Does instead of Do)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="292"/> - <source>docstring summary looks like a function's/method's signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="295"/> - <source>docstring does not mention the return value type</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="298"/> - <source>function/method docstring is separated by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="301"/> - <source>class docstring is not preceded by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="304"/> - <source>class docstring is not followed by a blank line</source> + <source>trailing quotes of docstring not on separate line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="332"/> + <source>docstring does not contain a @return line but function/method returns something</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="336"/> + <source>docstring contains a @return line but function/method doesn't return anything</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="340"/> + <source>docstring does not contain enough @param/@keyparam lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="343"/> + <source>docstring contains too many @param/@keyparam lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="346"/> + <source>keyword only arguments must be documented with @keyparam lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="349"/> + <source>order of @param/@keyparam lines does not match the function/method signature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="352"/> + <source>class docstring is preceded by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="354"/> + <source>class docstring is followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="356"/> + <source>function/method docstring is preceded by a blank line</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="359"/> - <source>docstring summary is not followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="310"/> - <source>last paragraph of docstring is not followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="314"/> - <source>private function/method is missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="317"/> - <source>private class is missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="319"/> - <source>leading quotes of docstring not on separate line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="322"/> - <source>trailing quotes of docstring not on separate line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="329"/> - <source>docstring does not contain a @return line but function/method returns something</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="333"/> - <source>docstring contains a @return line but function/method doesn't return anything</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="337"/> - <source>docstring does not contain enough @param/@keyparam lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="340"/> - <source>docstring contains too many @param/@keyparam lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="343"/> - <source>keyword only arguments must be documented with @keyparam lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="346"/> - <source>order of @param/@keyparam lines does not match the function/method signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="349"/> - <source>class docstring is preceded by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="351"/> - <source>class docstring is followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="353"/> - <source>function/method docstring is preceded by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="356"/> <source>function/method docstring is followed by a blank line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="362"/> - <source>last paragraph of docstring is followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="365"/> + <source>last paragraph of docstring is followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="368"/> <source>docstring does not contain a @exception line but function/method raises an exception</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="369"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="372"/> <source>docstring contains a @exception line but function/method doesn't raise an exception</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="374"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="377"/> <source>{0}: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="284"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="287"/> <source>docstring does not contain a summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="327"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="330"/> <source>docstring summary does not start with '{0}'</source> <translation type="unfinished"></translation> </message> @@ -9288,97 +9288,97 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2878"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source>Open File</source> <translation>Otevřít soubor</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="658"/> - <source>Undo</source> - <translation>Vrátit</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="661"/> - <source>Redo</source> - <translation>Znovu použít</translation> + <source>Undo</source> + <translation>Vrátit</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="664"/> + <source>Redo</source> + <translation>Znovu použít</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="667"/> <source>Revert to last saved state</source> <translation>Vrátit k poslednímu uloženému stavu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="668"/> - <source>Cut</source> - <translation>Vyjmout</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="671"/> - <source>Copy</source> - <translation>Kopírovat</translation> + <source>Cut</source> + <translation>Vyjmout</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="674"/> + <source>Copy</source> + <translation>Kopírovat</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="677"/> <source>Paste</source> <translation>Vložit</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="679"/> - <source>Indent</source> - <translation>Odsadit</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="682"/> - <source>Unindent</source> - <translation>Zrušit odsazení</translation> + <source>Indent</source> + <translation>Odsadit</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="685"/> - <source>Comment</source> - <translation>Vytvořit komentář</translation> + <source>Unindent</source> + <translation>Zrušit odsazení</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="688"/> - <source>Uncomment</source> - <translation>Zrušit komentář</translation> + <source>Comment</source> + <translation>Vytvořit komentář</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="691"/> - <source>Stream Comment</source> - <translation>Proudový komentář</translation> + <source>Uncomment</source> + <translation>Zrušit komentář</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="694"/> + <source>Stream Comment</source> + <translation>Proudový komentář</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="697"/> <source>Box Comment</source> <translation>Obdélníkový komentář</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="698"/> - <source>Select to brace</source> - <translation>Vybrat až po závorku</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="700"/> - <source>Select all</source> - <translation>Vybrat vše</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="701"/> + <source>Select to brace</source> + <translation>Vybrat až po závorku</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="703"/> + <source>Select all</source> + <translation>Vybrat vše</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="704"/> <source>Deselect all</source> <translation>Zrušit celý výběr</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="715"/> + <location filename="../QScintilla/Editor.py" line="718"/> <source>Shorten empty lines</source> <translation>Zkrátit prázdné řádky</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="722"/> + <location filename="../QScintilla/Editor.py" line="725"/> <source>Use Monospaced Font</source> <translation>Použít neporoporcionální font</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="727"/> + <location filename="../QScintilla/Editor.py" line="730"/> <source>Autosave enabled</source> <translation>Zapnout autosave</translation> </message> @@ -9388,22 +9388,22 @@ <translation type="obsolete">Zapnout autodoplňování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="768"/> + <location filename="../QScintilla/Editor.py" line="771"/> <source>Close</source> <translation>Zavřít</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="774"/> - <source>Save</source> - <translation>Uložit</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="777"/> + <source>Save</source> + <translation>Uložit</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="780"/> <source>Save As...</source> <translation>Uložit jako...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="793"/> + <location filename="../QScintilla/Editor.py" line="796"/> <source>Print</source> <translation>Tisk</translation> </message> @@ -9413,447 +9413,447 @@ <translation type="obsolete">Autodoplňování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="819"/> + <location filename="../QScintilla/Editor.py" line="822"/> <source>Complete from Document</source> <translation type="unfinished">z dokumentu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="821"/> + <location filename="../QScintilla/Editor.py" line="824"/> <source>Complete from APIs</source> <translation type="unfinished">z API</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="823"/> + <location filename="../QScintilla/Editor.py" line="826"/> <source>Complete from Document and APIs</source> <translation type="unfinished">z dokumentu a API</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="837"/> + <location filename="../QScintilla/Editor.py" line="840"/> <source>Check</source> <translation>Zkontrolovat</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="857"/> - <source>Show</source> - <translation>Zobrazit</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="859"/> - <source>Code metrics...</source> - <translation>Metrika kódu...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="860"/> - <source>Code coverage...</source> - <translation>Pokrytí kódu...</translation> + <source>Show</source> + <translation>Zobrazit</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="862"/> - <source>Show code coverage annotations</source> - <translation>Zobrazit poznámky pokrytí kódu</translation> + <source>Code metrics...</source> + <translation>Metrika kódu...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="863"/> + <source>Code coverage...</source> + <translation>Pokrytí kódu...</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="865"/> - <source>Hide code coverage annotations</source> - <translation>Skrýt poznámky pokrytí kódu</translation> + <source>Show code coverage annotations</source> + <translation>Zobrazit poznámky pokrytí kódu</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="868"/> + <source>Hide code coverage annotations</source> + <translation>Skrýt poznámky pokrytí kódu</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="871"/> <source>Profile data...</source> <translation>Profilovat data...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="881"/> + <location filename="../QScintilla/Editor.py" line="884"/> <source>Diagrams</source> <translation>Diagramy</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="883"/> + <location filename="../QScintilla/Editor.py" line="886"/> <source>Class Diagram...</source> <translation>Diagram třídy...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="885"/> + <location filename="../QScintilla/Editor.py" line="888"/> <source>Package Diagram...</source> <translation>Diagram balíčku...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="887"/> + <location filename="../QScintilla/Editor.py" line="890"/> <source>Imports Diagram...</source> <translation>Diagram importů...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="889"/> + <location filename="../QScintilla/Editor.py" line="892"/> <source>Application Diagram...</source> <translation>Diagram aplikace...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="907"/> - <source>Languages</source> - <translation>Jazyky</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="910"/> + <source>Languages</source> + <translation>Jazyky</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="913"/> <source>No Language</source> <translation>Žádný jazyk</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1153"/> + <location filename="../QScintilla/Editor.py" line="1156"/> <source>Toggle bookmark</source> <translation>Přepnout záložku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1155"/> + <location filename="../QScintilla/Editor.py" line="1158"/> <source>Next bookmark</source> <translation>Následující záložka</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1157"/> + <location filename="../QScintilla/Editor.py" line="1160"/> <source>Previous bookmark</source> <translation>Předchozí záložka</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1159"/> - <source>Clear all bookmarks</source> - <translation>Zrušit všechny záložky</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1162"/> + <source>Clear all bookmarks</source> + <translation>Zrušit všechny záložky</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1165"/> <source>Goto syntax error</source> <translation>Jít na chybu syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1164"/> + <location filename="../QScintilla/Editor.py" line="1167"/> <source>Show syntax error message</source> <translation>Zobrazit hlášení syntaktické chyby</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1166"/> + <location filename="../QScintilla/Editor.py" line="1169"/> <source>Clear syntax error</source> <translation>Zrušit chybu syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1179"/> + <location filename="../QScintilla/Editor.py" line="1182"/> <source>Toggle breakpoint</source> <translation>Přepnout breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1181"/> - <source>Toggle temporary breakpoint</source> - <translation>Přepnout dočasný breakpoint</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1184"/> + <source>Toggle temporary breakpoint</source> + <translation>Přepnout dočasný breakpoint</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1187"/> <source>Edit breakpoint...</source> <translation>Editovat breakpoint...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5154"/> + <location filename="../QScintilla/Editor.py" line="5161"/> <source>Enable breakpoint</source> <translation>Aktivovat breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1189"/> + <location filename="../QScintilla/Editor.py" line="1192"/> <source>Next breakpoint</source> <translation>Následující breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1191"/> + <location filename="../QScintilla/Editor.py" line="1194"/> <source>Previous breakpoint</source> <translation>Předchozí breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1193"/> - <source>Clear all breakpoints</source> - <translation>Zrušit všechny breakpointy</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1196"/> - <source>Next uncovered line</source> - <translation>Následující odkrytá řádka</translation> + <source>Clear all breakpoints</source> + <translation>Zrušit všechny breakpointy</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="1199"/> - <source>Previous uncovered line</source> - <translation>Předchozí odkrytá řádka</translation> + <source>Next uncovered line</source> + <translation>Následující odkrytá řádka</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="1202"/> + <source>Previous uncovered line</source> + <translation>Předchozí odkrytá řádka</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1205"/> <source>Next task</source> <translation>Následující úloha</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1204"/> + <location filename="../QScintilla/Editor.py" line="1207"/> <source>Previous task</source> <translation>Předchozí úloha</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1213"/> + <location filename="../QScintilla/Editor.py" line="1216"/> <source>LMB toggles bookmarks</source> <translation>LMB přepínač záložek</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1217"/> + <location filename="../QScintilla/Editor.py" line="1220"/> <source>LMB toggles breakpoints</source> <translation>LMB přepínač breakpointů</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1752"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>Modification of Read Only file</source> <translation>Modifikace souboru otevřeného jen pro čtení</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1752"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Pokoušíte se změnit soubor, který je otevřen jen pro čtení. Prosím, uložte jej nejdříve do jiného souboru.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2443"/> + <location filename="../QScintilla/Editor.py" line="2448"/> <source>Printing...</source> <translation>Tisk...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2460"/> - <source>Printing completed</source> - <translation>Tisk je hotov</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2462"/> - <source>Error while printing</source> - <translation>Chyba během tisku</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2465"/> + <source>Printing completed</source> + <translation>Tisk je hotov</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2467"/> + <source>Error while printing</source> + <translation>Chyba během tisku</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2470"/> <source>Printing aborted</source> <translation>Tisk byl zrušen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3041"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source>Save File</source> <translation>Uložit soubor</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2823"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source>File Modified</source> <translation>Soubor je modifikován</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4427"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion</source> <translation>Autodoplňování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4427"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Autodoplňování není dostupné protože zdrojová část autodoplňování nebyla nalezena.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5157"/> + <location filename="../QScintilla/Editor.py" line="5164"/> <source>Disable breakpoint</source> <translation>Deaktivovat breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5531"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Code Coverage</source> <translation>Pokrytí kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5531"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Please select a coverage file</source> <translation>Prosím, vyberte soubor s pokrytím kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5594"/> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>Show Code Coverage Annotations</source> <translation>Zobrazit poznámky pokrytí kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5587"/> - <source>All lines have been covered.</source> - <translation>Všechny řádky byly pokryty.</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="5594"/> + <source>All lines have been covered.</source> + <translation>Všechny řádky byly pokryty.</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>There is no coverage file available.</source> <translation>Soubor s pokrytím není dostupný.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5709"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Profile Data</source> <translation>Profilovat data</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5709"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Please select a profile file</source> <translation>Prosím, vyberte soubor s profilem</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5869"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>Syntax Error</source> <translation>Chyba syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5869"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>No syntax error message available.</source> <translation>Hlášení syntaktické chyby není dostupné.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6184"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Macro Name</source> <translation>Název makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6184"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Select a macro name:</source> <translation>Vyberte název makra:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6212"/> + <location filename="../QScintilla/Editor.py" line="6219"/> <source>Load macro file</source> <translation>Načíst soubor makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6255"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Macro files (*.macro)</source> <translation>Macro soubory (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6235"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source>Error loading macro</source> <translation>Chyba při načítání makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6255"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Save macro file</source> <translation>Uložit soubor s makrem</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6272"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source>Save macro</source> <translation>Uložit makro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6288"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source>Error saving macro</source> <translation>Chyba při ukládání makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6301"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Start Macro Recording</source> <translation>Spustit záznam makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6301"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Macro recording is already active. Start new?</source> <translation>Nahrávání makra již probíhá. Spustit nové?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6327"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Macro Recording</source> <translation>Záznam makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6327"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Enter name of the macro:</source> <translation>Vložte název makra:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6465"/> + <location filename="../QScintilla/Editor.py" line="6472"/> <source>File changed</source> <translation>Soubor změněn</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6769"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source>Drop Error</source> <translation>Zahodit chybu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6790"/> + <location filename="../QScintilla/Editor.py" line="6797"/> <source>Resources</source> <translation>Zdroje</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6792"/> - <source>Add file...</source> - <translation>Přidat soubor...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6794"/> - <source>Add files...</source> - <translation>Přidat soubory...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6796"/> - <source>Add aliased file...</source> - <translation>Přidat zástupce souboru...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6799"/> - <source>Add localized resource...</source> - <translation>Přidat lokalizované resource...</translation> + <source>Add file...</source> + <translation>Přidat soubor...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6801"/> + <source>Add files...</source> + <translation>Přidat soubory...</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="6803"/> + <source>Add aliased file...</source> + <translation>Přidat zástupce souboru...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6806"/> + <source>Add localized resource...</source> + <translation>Přidat lokalizované resource...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6810"/> <source>Add resource frame</source> <translation>Přidat resource frame</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6822"/> + <location filename="../QScintilla/Editor.py" line="6829"/> <source>Add file resource</source> <translation>Přidat soubor resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6838"/> + <location filename="../QScintilla/Editor.py" line="6845"/> <source>Add file resources</source> <translation>Přidat soubory resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6866"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Add aliased file resource</source> <translation>Přidat zástupce souboru resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6930"/> + <location filename="../QScintilla/Editor.py" line="6937"/> <source>Package Diagram</source> <translation>Diagram balíčku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6930"/> + <location filename="../QScintilla/Editor.py" line="6937"/> <source>Include class attributes?</source> <translation>Včetně atributů třídy?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6964"/> + <location filename="../QScintilla/Editor.py" line="6971"/> <source>Application Diagram</source> <translation>Diagram aplikace</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6964"/> + <location filename="../QScintilla/Editor.py" line="6971"/> <source>Include module names?</source> <translation>Včetně jmen modulů?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1030"/> + <location filename="../QScintilla/Editor.py" line="1033"/> <source>Export as</source> <translation>Exportovat jako</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1253"/> + <location filename="../QScintilla/Editor.py" line="1256"/> <source>Export source</source> <translation>Export zdroj</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1253"/> + <location filename="../QScintilla/Editor.py" line="1256"/> <source>No export format given. Aborting...</source> <translation>Nebyl zadán forám exportu. Zrušeno....</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6950"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Imports Diagram</source> <translation>Importovat diagram</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6950"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Include imports from external modules?</source> <translation>Zahrnout importy z externích modulů?</translation> </message> @@ -9863,332 +9863,332 @@ <translation type="obsolete">dynamický</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="746"/> + <location filename="../QScintilla/Editor.py" line="749"/> <source>Calltip</source> <translation>Rychlé tipy</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="790"/> + <location filename="../QScintilla/Editor.py" line="793"/> <source>Print Preview</source> <translation>Náhled tisku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="400"/> + <location filename="../QScintilla/Editor.py" line="403"/> <source><b>A Source Editor Window</b><p>This window is used to display and edit a source file. You can open as many of these as you like. The name of the file is displayed in the window's titlebar.</p><p>In order to set breakpoints just click in the space between the line numbers and the fold markers. Via the context menu of the margins they may be edited.</p><p>In order to set bookmarks just Shift click in the space between the line numbers and the fold markers.</p><p>These actions can be reversed via the context menu.</p><p>Ctrl clicking on a syntax error marker shows some info about this error.</p></source> <translation><b>Okno editoru zdrojového kódu</b><p>V tomto okně se zobrazuje a edituje soubor se zdrojovým kódem. Můžete otevřít oken podle libosti. Jméno souboru se zobrazuje v titlebaru okna.</p><p>Kliknutím do prostoru mezi čísly řádku a značkami skládání nastavíte breakpoint. Přes kontextové menu je pak lze editovat.</p><p>Záložka se vkládá kliknutím na stejné místo se stisknutou klávesou Shift.</p><p>Tyto akce mohou být navráceny zpět i opětovným kliknutím nebo přes kontextové menu.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="731"/> + <location filename="../QScintilla/Editor.py" line="734"/> <source>Typing aids enabled</source> <translation>Pomůcky při psaní zapnuty</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="994"/> + <location filename="../QScintilla/Editor.py" line="997"/> <source>End-of-Line Type</source> <translation>Typ Konec-řádku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="998"/> + <location filename="../QScintilla/Editor.py" line="1001"/> <source>Unix</source> <translation>Unix</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1005"/> + <location filename="../QScintilla/Editor.py" line="1008"/> <source>Windows</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1012"/> + <location filename="../QScintilla/Editor.py" line="1015"/> <source>Macintosh</source> <translation>Macintosh</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="953"/> + <location filename="../QScintilla/Editor.py" line="956"/> <source>Encodings</source> <translation>Kódování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="933"/> + <location filename="../QScintilla/Editor.py" line="936"/> <source>Guessed</source> <translation>Odhadem</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1268"/> + <location filename="../QScintilla/Editor.py" line="1271"/> <source>Alternatives</source> <translation>Alternativy</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1284"/> + <location filename="../QScintilla/Editor.py" line="1287"/> <source>Pygments Lexer</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1284"/> + <location filename="../QScintilla/Editor.py" line="1287"/> <source>Select the Pygments lexer to apply.</source> <translation>Použít Pygments lexer.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7242"/> + <location filename="../QScintilla/Editor.py" line="7249"/> <source>Check spelling...</source> <translation>Zatrhnout kontrolu...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="707"/> + <location filename="../QScintilla/Editor.py" line="710"/> <source>Check spelling of selection...</source> <translation>Zatrhnout výběr kontroly...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7245"/> + <location filename="../QScintilla/Editor.py" line="7252"/> <source>Add to dictionary</source> <translation>Přidat do slovníku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7247"/> + <location filename="../QScintilla/Editor.py" line="7254"/> <source>Ignore All</source> <translation>Ignorovat vše</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="711"/> + <location filename="../QScintilla/Editor.py" line="714"/> <source>Remove from dictionary</source> <translation>Odebrat ze slovníku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="340"/> + <location filename="../QScintilla/Editor.py" line="343"/> <source><p>The size of the file <b>{0}</b> is <b>{1} KB</b>. Do you really want to load it?</p></source> <translation><p>Velikost souboru <b>{0}</b> je <b>{1} KB</b>. Opravdu jej chcete načíst?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1245"/> + <location filename="../QScintilla/Editor.py" line="1248"/> <source><p>No exporter available for the export format <b>{0}</b>. Aborting...</p></source> <translation><p>Pro formát exportu <b>{0}</b> není exportér dostupný. Zrušeno.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1264"/> + <location filename="../QScintilla/Editor.py" line="1267"/> <source>Alternatives ({0})</source> <translation>Alternativy ({0})</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2823"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>Soubor <b>{0}</b> obsahuje neuložené změny.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2878"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>Soubor <b>{0}</b> nemůže být přejmenován.<br />Důvod: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2982"/> + <location filename="../QScintilla/Editor.py" line="2987"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>Soubor <b>{0}</b> nemůže být přejmenován.<br />Důvod: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6226"/> + <location filename="../QScintilla/Editor.py" line="6233"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Soubor s makrem <b>{0}</b> nelze načíst.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6235"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Soubor s makrem <b>{0}</b> je poškozen.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6288"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>So souboru s makrem <b>{0}</b> nelze zapisovat.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6629"/> + <location filename="../QScintilla/Editor.py" line="6636"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6769"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> není soubor.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6866"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Alias for file <b>{0}</b>:</source> <translation>Zástupce pro soubor <b>{0}</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1169"/> - <source>Next warning</source> - <translation>Následující varování</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1172"/> + <source>Next warning</source> + <translation>Následující varování</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1175"/> <source>Previous warning</source> <translation>Předchozí varování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1174"/> + <location filename="../QScintilla/Editor.py" line="1177"/> <source>Show warning message</source> <translation>Zobrazit varování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1176"/> + <location filename="../QScintilla/Editor.py" line="1179"/> <source>Clear warnings</source> <translation>Vyčistit varování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3041"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6272"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6123"/> - <source>Warning: {0}</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6130"/> + <source>Warning: {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6137"/> <source>Error: {0}</source> <translation type="unfinished">Chyby: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6461"/> + <location filename="../QScintilla/Editor.py" line="6468"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4532"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Activating Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4532"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4852"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Activating Calltip Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4852"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="786"/> + <location filename="../QScintilla/Editor.py" line="789"/> <source>Open 'rejection' file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="893"/> + <location filename="../QScintilla/Editor.py" line="896"/> <source>Load Diagram...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1207"/> - <source>Next change</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1210"/> + <source>Next change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1213"/> <source>Previous change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7659"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7659"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6059"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>Warning</source> <translation type="unfinished">Varování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6059"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6120"/> + <location filename="../QScintilla/Editor.py" line="6127"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="760"/> - <source>New Document View</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="763"/> + <source>New Document View</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="766"/> <source>New Document View (with new split)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="847"/> + <location filename="../QScintilla/Editor.py" line="850"/> <source>Tools</source> <translation type="unfinished">Nástroje</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="975"/> + <location filename="../QScintilla/Editor.py" line="978"/> <source>Re-Open With Encoding</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6455"/> + <location filename="../QScintilla/Editor.py" line="6462"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> byl změněn po té co již byl načten do eric5. Znovu načíst?</p> {0}?} {6.?}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="738"/> + <location filename="../QScintilla/Editor.py" line="741"/> <source>Automatic Completion enabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="816"/> + <location filename="../QScintilla/Editor.py" line="819"/> <source>Complete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4581"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4581"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7746"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7746"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="780"/> + <location filename="../QScintilla/Editor.py" line="783"/> <source>Save Copy...</source> <translation type="unfinished"></translation> </message> @@ -10231,7 +10231,7 @@ <translation>Stiskněte pro výběr API souboru ze seznamu instalovaných API</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> <source>Add from installed APIs</source> <translation>Přidat z instalovaných API</translation> </message> @@ -10241,7 +10241,7 @@ <translation>Stiskněte pro kompilování vybrané API definici</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="299"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="301"/> <source>Compile APIs</source> <translation>Kompilovat API</translation> </message> @@ -10286,12 +10286,12 @@ <translation>API soubor (*.api);;Všechny soubory (*)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="238"/> <source>Select from the list of installed API files</source> <translation>Výběr ze seznamu instalovaných API souborů</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="314"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="316"/> <source>Cancel compilation</source> <translation>Zrušit kompilaci</translation> </message> @@ -10306,17 +10306,17 @@ <translation>Stiskněte pro výběr API souboru ze seznamu API souborů instalovaných z pluginů</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> <source>Add from Plugin APIs</source> <translation>Přidat z API pluginů</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> <source>Select from the list of API files installed by plugins</source> <translation>Vybrat ze seznamu API souborů instalovaných pluginy</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> <source>There are no APIs installed yet. Selection is not available.</source> <translation type="unfinished"></translation> </message> @@ -10488,6 +10488,89 @@ </message> </context> <context> + <name>EditorButtonsWidget</name> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="175"/> + <source>Bold</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="177"/> + <source>Italic</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="179"/> + <source>Strike Through</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="182"/> + <source>Header 1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="184"/> + <source>Header 2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="186"/> + <source>Header 3</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="188"/> + <source>Header</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="193"/> + <source>Inline Code</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="195"/> + <source>Code Block</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="197"/> + <source>Quote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="200"/> + <source>Add Hyperlink</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="202"/> + <source>Add Horizontal Line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="204"/> + <source>Add Image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="207"/> + <source>Add Bulleted List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="209"/> + <source>Add Numbered List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="273"/> + <source>Level {0}</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>EditorCalltipsPage</name> <message> <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="17"/> @@ -11297,7 +11380,7 @@ <translation>Výběr alternativního lexeru pro spojení</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightersPage.py" line="142"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightersPage.py" line="146"/> <source>Alternative</source> <translation>Alternativa</translation> </message> @@ -11330,7 +11413,7 @@ <translation>Výběr výplně konce řádku.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> <source>Fill to end of line</source> <translation>Vyplnit do konce řádku</translation> </message> @@ -11400,17 +11483,17 @@ <translation>Vše Vyplnit do konce řádku</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="351"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="355"/> <source>Enabled</source> <translation>Zapnuto</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="352"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="356"/> <source>Disabled</source> <translation>Vypnuto</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> <source>Select fill to end of line for all styles</source> <translation>Vybrat pro doplnit do konce řádku pro všechny styly</translation> </message> @@ -11470,27 +11553,27 @@ <translation>Export všech stylů</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465"/> <source>Export Highlighting Styles</source> <translation>Export stylů zvýraznění</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="497"/> <source>Import Highlighting Styles</source> <translation>Importovat styly zvýraznění</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="477"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="481"/> <source>Highlighting styles file (*.e4h)</source> <translation>Soubor se styly zvýrazňování (*.e4h)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465"/> <source><p>The highlighting styles could not be exported to file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Styly zvýraznění syntaxe se do souboru <b>{0}</b> nepodařilo exportovat.</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="497"/> <source><p>The highlighting styles could not be read from file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Styly zvýraznění syntaxe se ze souboru <b>{0}</b> nepodařilo načít.</p><p>Důvod: {1}</p></translation> </message> @@ -11617,12 +11700,12 @@ <translation>Bash Lexer vlastnosti</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1048"/> <source>Select whether folding of comments shall be possible</source> <translation>Vybrat, jestliže je možné skládat komentáře</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1051"/> <source>Fold comments</source> <translation>Skládat komentáře</translation> </message> @@ -11652,22 +11735,22 @@ <translation>Odsadit levé složené závorky</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="990"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/> <source>Select whether folding at else statement should be possible</source> <translation>Vybrat, jestliže je možné skládat výrazy else</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/> <source>Fold at else</source> <translation>Skládat else</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="522"/> <source>Select whether folding of preprocessor directives shall be possible</source> <translation>Vybrat, jestliže mají být možné příkazy preprocesoru skládání</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="525"/> <source>Fold preprocessor directives</source> <translation>Příkazy preprocesoru skládání</translation> </message> @@ -11712,127 +11795,127 @@ <translation>Tagy rozlišují velké/malé znaky</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="516"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/> <source>Perl Lexer Properties</source> <translation>Perl Lexer vlastnosti</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="637"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/> <source>Povray Lexer Properties</source> <translation>Povray Lexer vlastnosti</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="643"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/> <source>Select whether folding of directives shall be possible</source> <translation>Vybrat jestliže je možné skládání direktiv</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="646"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/> <source>Fold directives</source> <translation>Skládat direktivy</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="685"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> <source>Python Lexer Properties</source> <translation>Python Lexer vlastnosti</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="796"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="825"/> <source>Select whether bad indentation shall be highlighted</source> <translation>Vybrat, má-li se zvýraznit chybné odsazení</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="721"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="750"/> <source>Select whether text should be autoindented after a ':'</source> <translation>Vybrat, má-li se text automaticky odsadit po ':'</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="724"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="753"/> <source>Auto indentation after ':'</source> <translation>Automatické odsazení po ':'</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="730"/> <source>Select whether folding of strings shall be possible</source> <translation>Vybrat, jestliže je možné skládat stringy</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="733"/> <source>Fold strings</source> <translation>Skládat stringy</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="827"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/> <source>SQL Lexer Properties</source> <translation>SQL Lexer vlastnosti</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="863"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="892"/> <source>Select to enable Backslash Escapes</source> <translation>Vybrat pro aktivaci backslash escape sekvencí</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="866"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="895"/> <source>Backslash Escapes</source> <translation>Escape sekvence</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="964"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/> <source>VHDL Lexer Properties</source> <translation>VHDL Lexer vlastnosti</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="999"/> <source>Select whether folding of blocks at a parenthesis shall be possible</source> <translation>Vybrat jestliže je možné skládání bloků na závorkách</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1002"/> <source>Fold at parenthesis</source> <translation>Skládat na závorkách</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1009"/> <source>Select whether folding of begin blocks shall be possible</source> <translation>Vybrat jestliže je možné skládání začátků bloků</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1012"/> <source>Fold at begin</source> <translation>Skládat na začátku</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/> <source>Pascal Lexer Properties</source> <translation>Pascal Lexer vlastnosti</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="565"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="594"/> <source>PostScript Lexer Properties</source> <translation>PostScript Lexer vlastnosti</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="581"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="610"/> <source>Select to mark tokens</source> <translation>Vybrat pro označnení tokenů</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="584"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="613"/> <source>Mark Tokens</source> <translation>Oznařit tokeny</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="593"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="622"/> <source>PostScript Level:</source> <translation>PostScript úroveň:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="600"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="629"/> <source>Select the PostScript level</source> <translation>Vybrat PostScript úroveň</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1013"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1042"/> <source>YAML Lexer Properties</source> <translation>YAML Lexer vlastnosti</translation> </message> @@ -11882,62 +11965,62 @@ <translation>Stylovat skripty</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="503"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/> <source>Select to enable smart highlighting of keywords</source> <translation>Vybrat pro zapnutí zvýraznění klíčových slov</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/> - <source>Smart Highlighting</source> - <translation>Zvýraznění</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/> - <source>Select to enable folding of Perl packages</source> - <translation>Vybrat pro zapnutí skládání Perl balíčků</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="535"/> + <source>Smart Highlighting</source> + <translation>Zvýraznění</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="561"/> + <source>Select to enable folding of Perl packages</source> + <translation>Vybrat pro zapnutí skládání Perl balíčků</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="564"/> <source>Fold packages</source> <translation>Skládat balíčky</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="542"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="571"/> <source>Select to enable folding of Perl POD blocks</source> <translation>Vybrat pro zapnutí skládání Perl POD bloků</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="574"/> <source>Fold POD blocks</source> <translation>Skládat POD bloky</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="741"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="770"/> <source>Select to allow Python v2 unicode string literals (e.g. u"utf8")</source> <translation>Vybrat pro umožnění Python v2 unicode string literály (např. u"utf8")</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="744"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="773"/> <source>Allow v2 unicode string literals</source> <translation>Povolit v2 unicode string literály</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="751"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="780"/> <source>Select to allow Python v3 binary and octal literals (e.g. 0b1011, 0o712)</source> <translation>Vybrat pro povolení Python v3 binárních a oktalových literálů (např. 0b1011, 0o712)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="754"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/> <source>Allow v3 binary and octal literals</source> <translation>Povolit v3 binární a oktalové literály</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="761"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="790"/> <source>Select to allow Python v3 bytes string literals (e.g. b"bytes")</source> <translation>Povolit Python v3 bytové string literály (např. b"bytes")</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="764"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="793"/> <source>Allow v3 bytes string literals</source> <translation>Povolit v3 bytové string literály</translation> </message> @@ -11972,112 +12055,112 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="695"/> <source>Properties Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/> <source>Select to allow initial spaces in a line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/> <source>Allow initial spaces</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="740"/> <source>Select whether folding of triple quoted strings shall be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="743"/> <source>Fold triple quoted strings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="760"/> <source>Select to allow strings to span newline characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="734"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="763"/> <source>Strings may span newline characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="808"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="837"/> <source>Ruby Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="853"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="882"/> <source>Select whether only BEGIN blocks can be folded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="885"/> <source>Only BEGIN blocks can be folded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="873"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="902"/> <source>Select if words may contain dots</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="876"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="905"/> <source>Words may contain dots</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="883"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="912"/> <source>Select to allow '#' as a comment character</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="886"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="915"/> <source>Allow '#' as comment character</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="893"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="922"/> <source>Select to enable quoted identifiers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="896"/> - <source>Enable quoted identifiers</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="906"/> - <source>TCL Lexer Properties</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="925"/> - <source>TeX Lexer Properties</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="941"/> - <source>Select to treat comments as TeX source</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="944"/> - <source>Treat comments as TeX source</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="951"/> - <source>Select to treat \if<unknown> as a command</source> + <source>Enable quoted identifiers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="935"/> + <source>TCL Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="954"/> + <source>TeX Lexer Properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/> + <source>Select to treat comments as TeX source</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/> + <source>Treat comments as TeX source</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/> + <source>Select to treat \if<unknown> as a command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/> <source>Treat \if<unknown> as command</source> <translation type="unfinished"></translation> </message> @@ -12087,7 +12170,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="774"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="803"/> <source>Highlight sub-identifiers</source> <translation type="unfinished"></translation> </message> @@ -12097,7 +12180,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="771"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="800"/> <source>Select to highlight sub-identifiers defined in keyword set 2</source> <translation type="unfinished"></translation> </message> @@ -12152,32 +12235,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="812"/> <source>Highlight bad indentation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>No Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Inconsistent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Tabs after Spaces</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Spaces</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Tabs</source> <translation type="unfinished">Taby</translation> </message> @@ -12197,7 +12280,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="194"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/> <source>Highlight escape sequences</source> <translation type="unfinished"></translation> </message> @@ -12211,6 +12294,26 @@ <source>Allow verbatim string escape sequences</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/> + <source>JSON</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="483"/> + <source>Select to enable highlighting of line/block comments</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="486"/> + <source>Highlight comments</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/> + <source>Select to enable highlighting of escape sequences in strings</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSearchPage</name> @@ -13345,6 +13448,16 @@ <source>Select the colour for the search marker</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1866"/> + <source>Select to hide the Format Buttons bar when formatting is not supported</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1869"/> + <source>Hide Format Buttons bar when not supported</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSyntaxPage</name> @@ -13610,7 +13723,7 @@ <context> <name>EmailDialog</name> <message> - <location filename="../UI/EmailDialog.py" line="339"/> + <location filename="../UI/EmailDialog.py" line="346"/> <source>Send bug report</source> <translation>Odeslat hlášení o chybách</translation> </message> @@ -13680,17 +13793,17 @@ <translation>Opravdu chcete zavřít dialog?</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="293"/> + <location filename="../UI/EmailDialog.py" line="300"/> <source>Mail Server Password</source> <translation>Heslo mail serveru</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="293"/> + <location filename="../UI/EmailDialog.py" line="300"/> <source>Enter your mail server password</source> <translation>Zadejte heslo vašeho mail serveru</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="357"/> + <location filename="../UI/EmailDialog.py" line="364"/> <source>Attach file</source> <translation>Připojit soubor</translation> </message> @@ -13720,12 +13833,12 @@ <translation>Poslat požadavek na vlastnost</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="311"/> + <location filename="../UI/EmailDialog.py" line="318"/> <source><p>Authentication failed.<br>Reason: {0}</p></source> <translation><p>Autentizace selhala.<br>Důvod: {0}</p></translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="339"/> + <location filename="../UI/EmailDialog.py" line="346"/> <source><p>Message could not be sent.<br>Reason: {0}</p></source> <translation><p>Zprávu nelze odeslat.<br>Důvod: {0}</p></translation> </message> @@ -13738,17 +13851,17 @@ <translation><b>Konfigurovat email</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="183"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="225"/> <source>Enter your password for accessing the mail server</source> <translation>Zadejte vaše heslo pro přístup na mail server</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="211"/> <source>Enter your mail server username</source> <translation>Zadejte vaše přihlašovací jméno na mail server</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="106"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="170"/> <source>Signature:</source> <translation>Podpis:</translation> </message> @@ -13758,52 +13871,52 @@ <translation>Zadejte adresu vašeho mail serveru</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="92"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/> <source>Email address:</source> <translation>Email adresa:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="116"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="180"/> <source>Enter your email signature</source> <translation>Zadejte váš email podpis</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="99"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/> <source>Enter your email address</source> <translation>Zadejte vaši emailovou adresu</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="138"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="192"/> <source>Select to authenticatate against the mail server</source> <translation>Výběr autentizace proti mail serveru</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="141"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="195"/> <source>Mail server needs authentication</source> <translation>Mail server požaduje autentizaci</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="153"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="204"/> <source>Username:</source> <translation>Přihlašovací jméno:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="173"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="218"/> <source>Password:</source> <translation>Heslo:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="128"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="104"/> <source>Select to use TLS</source> <translation>Vybrat pro použití TLS</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="131"/> <source>Use TLS</source> - <translation>Použít TLS</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="60"/> + <translation type="obsolete">Použít TLS</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="124"/> <source>Enter the port of the mail server</source> <translation>Zadejte port mail serveru</translation> </message> @@ -13815,33 +13928,68 @@ <message> <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/> <source>Outgoing mail server port:</source> - <translation>Odchozí mail server port:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="193"/> + <translation type="obsolete">Odchozí mail server port:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="235"/> <source>Press to test the login data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="196"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="238"/> <source>Test Login</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/> <source>Login Test</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="138"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="204"/> <source>The login test succeeded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/> <source><p>The login test failed.<br>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/> + <source>Encryption Method:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="81"/> + <source>Select to use no encryption</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="84"/> + <source>None</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="94"/> + <source>Select to use SSL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="97"/> + <source>SSL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="107"/> + <source>TLS</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="117"/> + <source>Port:</source> + <translation type="unfinished">Port:</translation> + </message> </context> <context> <name>EricAccessHandler</name> @@ -14788,54 +14936,54 @@ <context> <name>ExceptionsFilterDialog</name> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="16"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="17"/> <source><b>Exception Filter</b> <p>This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the "Start Debugging" dialog is unchecked, no exception will be reported at all.</p> <p>Please note, that unhandled exceptions are always highlighted independent of these settings.</p></source> <translation><b>Filtr výjimek</b><p>Tento dialog je použit pro zadání typů výjimek, které mají být zvýrazněny během debugování. Je-li tento seznam prázdný, tak budou zvýrazněny všechny výjimky. Jestliže je přepínač v dialogu "Spustit debugování" vypnutý, tak žádné výjimky zobrazovány nebudou.</p><p>Všimněte si, že neošetřené výjimky jsou vždy zvýrazněny nezávisle na těchto nastaveních.</p></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="69"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="64"/> <source>Delete</source> <translation>Smazat</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="52"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="51"/> <source>Enter an exception type that shall be highlighted</source> <translation>Zadejte typ výjimky, která má být zvýrazněna</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="27"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="28"/> <source>List of exceptions that shall be highlighted</source> <translation>Seznam výjimek, které budou zvýrazněny</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="42"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="41"/> <source>Press to add the entered exception to the list</source> <translation>Stisknout pro přidání zadané výjimky do seznamu</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="45"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="44"/> <source>Add</source> <translation>Přidat</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="66"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="61"/> <source>Press to delete the selected exception from the list</source> <translation>Stisknout pro smazání vybraných výjimek ze seznamu</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="13"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="14"/> <source>Exceptions Filter</source> <translation>Filtr výjimek</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="76"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="71"/> <source>Press to delete all exceptions from the list</source> <translation>Stisknout pro smazání všech výjimek v seznamu</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="79"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="74"/> <source>Delete All</source> <translation>Smazat vše</translation> </message> @@ -21954,7 +22102,7 @@ <translation type="obsolete">hg proces skončil s exit kódem {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1822"/> <source>The hg process did not finish within 30s.</source> <translation>hg proces neskončil do 30s.</translation> </message> @@ -22009,147 +22157,147 @@ <translation>Přejmenování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1057"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1359"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/> <source>Pulling from a remote Mercurial repository</source> <translation>Stažení (pull) z Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2022"/> <source>Pushing to a remote Mercurial repository</source> <translation>Odeslání (push) do Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230"/> <source>Creating branch in the Mercurial repository</source> <translation>Vytvoření větve v Mercurial repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Ověřit integritu Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2427"/> <source>Showing aliases for remote repositories</source> <translation>Zobrazení aliasů pro vzdálené úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2451"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> <source>Shall the working directory be updated?</source> <translation>Má být pracovní adresář aktualizován?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2604"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2730"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2727"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2625"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2475"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2759"/> <source>Removing files from the Mercurial repository only</source> <translation>Odebrat soubory jen z Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2710"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793"/> <source>No revision given. Aborting...</source> <translation>Nebyla dána žádná revize. Ruším...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2623"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2578"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -22159,72 +22307,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2959"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -22239,157 +22387,157 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Revert changes</source> <translation type="unfinished">Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1030"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="997"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> nelze přečíst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1133"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3614"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3924"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -24719,7 +24867,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>Mercurial Log</source> <translation></translation> </message> @@ -24749,17 +24897,17 @@ <translation>Vybrat pole pro filtrování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="103"/> <source>Message</source> <translation>Zpráva</translation> </message> @@ -24784,142 +24932,142 @@ <translation>Tagy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="285"/> <source>Action</source> <translation>Akce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="290"/> <source>Path</source> <translation>Cesta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="295"/> <source>Copy from</source> <translation>Kopírovat z</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="306"/> <source>Press to get the next bunch of log entries</source> <translation>Stisknout pro získání další části log údajů</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="309"/> <source>&Next</source> <translation>&Další</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="316"/> <source>Enter the limit of entries to fetch</source> <translation>Zadejte max. počet, ke stažení</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="335"/> <source>Select to stop listing log messages at a copy or move</source> <translation>Vybrat pro zastavení výpisu zpráv pro kopírování neobo přesun</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="338"/> <source>Stop on Copy/Move</source> <translation>Zatavit kopírování/přesun</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="398"/> <source>Press to compare two revisions</source> <translation>Stisknout pro porovnání dvou revizí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="401"/> <source>&Compare Revisions</source> <translation>&Porovnat revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="462"/> <source>Errors</source> <translation>Chyby</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="468"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Mercurial log chyb</b><p>Zobrazí možné chyby z příkazu hg log.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="484"/> <source>Input</source> <translation>Vstup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="474"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="506"/> <source>Press to send the input to the hg process</source> <translation>Stisknutím odeslat vstup do hg procesu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="477"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="509"/> <source>&Send</source> <translation>Ode&slat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="512"/> <source>Alt+S</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="519"/> <source>Enter data to be sent to the hg process</source> <translation>Zadejte data, která se odešlou do hg procesu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="526"/> <source>Select to switch the input field to password mode</source> <translation>Vybrat pro přepnutí vstupního pole do režimu hesla</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="529"/> <source>&Password Mode</source> <translation>Mód vstu&pu hesla</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="532"/> <source>Alt+P</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> <source>Added</source> <translation>Přidáno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169"/> <source>Deleted</source> <translation>Smazáno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source>Modified</source> <translation>Změněno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="993"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="993"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="666"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="747"/> <source>The hg process did not finish within 30s.</source> <translation>Hg proces neskončil do 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="669"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="750"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="753"/> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> @@ -24929,22 +25077,22 @@ <translation>Graf</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="378"/> <source>Press to generate a diff to the first parent revision</source> <translation>Stisknout pro generování diffu s první rodičovskou revizí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="381"/> <source>Diff to Parent &1</source> <translation>Diff s rodičem &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> <source>Press to generate a diff to the second parent revision</source> <translation>Stisknout pro generování diffu s druhou rodičovskou revizí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="391"/> <source>Diff to Parent &2</source> <translation>Diff s rodičem &2</translation> </message> @@ -24959,32 +25107,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="147"/> <source>All</source> <translation type="unfinished">Vše</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="77"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> <source>Bookmarks</source> <translation type="unfinished">Záložky</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="90"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> @@ -24994,83 +25142,83 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="227"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1899"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2091"/> <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/HgLogBrowserDialog.ui" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="444"/> <source>Select to show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="421"/> <source>Select action from menu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> - <source>Tag</source> - <translation type="unfinished">Tag</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="204"/> - <source>Tag the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1773"/> - <source>Switch</source> - <translation type="unfinished">Přepnout</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="209"/> - <source>Switch the working directory to the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/> + <source>Tag</source> + <translation type="unfinished">Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="235"/> + <source>Tag the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1951"/> + <source>Switch</source> + <translation type="unfinished">Přepnout</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="240"/> + <source>Switch the working directory to the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="265"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="983"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1087"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -25095,345 +25243,322 @@ <translation type="unfinished">Stisknout pro vyhledání následujícího výskytu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Find</source> <translation type="unfinished">Hledat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Filter</source> <translation type="unfinished">Filtr</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> - <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2192"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2192"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' nebyl nalezen.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/> <source>File</source> <translation type="unfinished">Soubor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174"/> <source>Draft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> <source>Public</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/> <source>Secret</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2049"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="261"/> <source>Pull changes from a remote repository</source> <translation type="unfinished">Stáhnout změny (pull) ze vzdáleného repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="274"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1852"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2030"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2091"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> <source>Fetch changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="291"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="245"/> <source>Define Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="248"/> <source>Bookmark the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250"/> <source>Move Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253"/> <source>Move bookmark to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1972"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1972"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1816"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1994"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1816"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1994"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1937"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr><tr><td><b>Children</b></td><td>{5}</td></tr>{6}</table></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="368"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> + <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="14"/> <source>Mercurial Log</source> - <translation>Mercurial log</translation> + <translation type="obsolete">Mercurial log</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="26"/> <source>Log</source> - <translation>Log</translation> + <translation type="obsolete">Log</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="32"/> <source><b>Mercurial Log</b><p>This shows the output of the hg log command. By clicking on the links you may show the difference between revisions.</p></source> - <translation><b>Mercurial Log</b><p>Zobrazuje výstup z hg log příkazu. Kliknutím na odkazy můžete zobrazit rozdíly mezi verzemi.</p></translation> + <translation type="obsolete"><b>Mercurial Log</b><p>Zobrazuje výstup z hg log příkazu. Kliknutím na odkazy můžete zobrazit rozdíly mezi verzemi.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="61"/> <source>Errors</source> - <translation>Chyby</translation> + <translation type="obsolete">Chyby</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="67"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> - <translation><b>Mercurial log chyb</b><p>Zobrazí možné chyby z příkazu hg log.</p></translation> + <translation type="obsolete"><b>Mercurial log chyb</b><p>Zobrazí možné chyby z příkazu hg log.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="83"/> <source>Input</source> - <translation>Vstup</translation> + <translation type="obsolete">Vstup</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="105"/> <source>Press to send the input to the hg process</source> - <translation>Stisknutím odeslat vstup do hg procesu</translation> + <translation type="obsolete">Stisknutím odeslat vstup do hg procesu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="108"/> <source>&Send</source> - <translation>Ode&slat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="111"/> - <source>Alt+S</source> - <translation></translation> + <translation type="obsolete">Ode&slat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="118"/> <source>Enter data to be sent to the hg process</source> - <translation>Zadejte data, která se odešlou do hg procesu</translation> + <translation type="obsolete">Zadejte data, která se odešlou do hg procesu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="125"/> <source>Select to switch the input field to password mode</source> - <translation>Vybrat pro přepnutí vstupního pole do režimu hesla</translation> + <translation type="obsolete">Vybrat pro přepnutí vstupního pole do režimu hesla</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="128"/> <source>&Password Mode</source> - <translation>Mód vstu&pu hesla</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="131"/> - <source>Alt+P</source> - <translation></translation> + <translation type="obsolete">Mód vstu&pu hesla</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="64"/> <source><b>Processing your request, please wait...</b></source> - <translation><p>Zpracovávám váš požadavek, prosím čekejte...</p></translation> + <translation type="obsolete"><p>Zpracovávám váš požadavek, prosím čekejte...</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="74"/> <source>Revision</source> - <translation>Revize</translation> + <translation type="obsolete">Revize</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> <source>Process Generation Error</source> - <translation>Chyba v procesu generování</translation> + <translation type="obsolete">Chyba v procesu generování</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> + <translation type="obsolete">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/> <source>No log available for '{0}'</source> - <translation>Log není pro '{0}' dostupný</translation> + <translation type="obsolete">Log není pro '{0}' dostupný</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="344"/> <source>diff to {0}</source> - <translation>diff na {0}</translation> + <translation type="obsolete">diff na {0}</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="358"/> <source>Tags: {0}<br /> </source> - <translation>Tagy: {0}<br/></translation> + <translation type="obsolete">Tagy: {0}<br/></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="364"/> <source>Parents: {0}<br /> </source> - <translation>Rodiče: {0}<br/></translation> + <translation type="obsolete">Rodiče: {0}<br/></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="367"/> <source><i>Author: {0}</i><br /> </source> - <translation><i>Autor: {0}</i><br /></translation> + <translation type="obsolete"><i>Autor: {0}</i><br /></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="371"/> <source><i>Date: {0}, {1}</i><br /> </source> - <translation><i>Datum: {0}, {1}</i><br /></translation> + <translation type="obsolete"><i>Datum: {0}, {1}</i><br /></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="387"/> <source>Added {0}<br /> </source> - <translation>Přidáno: {0}<br/></translation> + <translation type="obsolete">Přidáno: {0}<br/></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="393"/> <source>Modified {0}<br /> </source> - <translation>Změněno: {0}<br/></translation> + <translation type="obsolete">Změněno: {0}<br/></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="399"/> <source>Deleted {0}<br /> </source> - <translation>Smazáno: {0}<br/></translation> + <translation type="obsolete">Smazáno: {0}<br/></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="270"/> <source>The hg process did not finish within 30s.</source> - <translation>Hg proces neskončil do 30s.</translation> + <translation type="obsolete">Hg proces neskončil do 30s.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> <source>Could not start the hg executable.</source> - <translation>Nelze spustit hg program.</translation> + <translation type="obsolete">Nelze spustit hg program.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="276"/> <source>Mercurial Error</source> - <translation>Mercurial chyba</translation> + <translation type="obsolete">Mercurial chyba</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="382"/> <source>Added {0} (copied from {1})<br /> </source> - <translation>Přidáno {0} (zkopírováno z {1})<br /> + <translation type="obsolete">Přidáno {0} (zkopírováno z {1})<br /> </translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="361"/> - <source>Bookmarks: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="352"/> - <source>Phase: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="45"/> - <source>Select to show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="48"/> - <source>Show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="355"/> - <source>Branch: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>HgMergeDialog</name> @@ -25811,87 +25936,87 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="605"/> <source>Version Control</source> <translation>Kontrola verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="617"/> <source>Commit changes to repository...</source> <translation>Zapsat změny do repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> <source>Add to repository</source> <translation>Přidat do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628"/> <source>Remove from repository (and disk)</source> <translation>Odebrat z repozitáře (a z disku)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="548"/> <source>Show log</source> - <translation>Zobrazit log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="552"/> + <translation type="obsolete">Zobrazit log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="544"/> <source>Show log browser</source> <translation>Zobrazit log prohlížeč</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> <source>Show status</source> <translation>Zobrazit status</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="343"/> <source>Show annotated file</source> <translation>Zobrazit komentované soubory</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Revert changes</source> <translation>Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="663"/> <source>Select all local file entries</source> <translation>Vybrat všechny lokální soubory</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="665"/> <source>Select all versioned file entries</source> <translation>Vybrat všechny soubory ve správě verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> <source>Select all local directory entries</source> <translation>Vybrat všechny lokální adresáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="669"/> <source>Select all versioned directory entries</source> <translation>Vybrat všechny adresáře ve správě verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Remove from repository only</source> <translation>Odebrat jen z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Do you really want to remove these files from the repository?</source> <translation>Opravdu chcete odebrat tyto soubory z repozitáře?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="539"/> <source>Copy</source> <translation type="unfinished">Kopírovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="541"/> <source>Move</source> <translation type="unfinished"></translation> </message> @@ -25901,42 +26026,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="639"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="329"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="651"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="643"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="338"/> <source>Show differences side-by-side (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="653"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="656"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="672"/> <source>Configure...</source> <translation type="unfinished">Konfigurovat...</translation> </message> @@ -26085,581 +26210,566 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> - <source>Show log</source> - <translation>Zobrazit log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> - <source>Show &log</source> - <translation>Zobrazit &log</translation> + <source>Show log browser</source> + <translation>Zobrazit log prohlížeč</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> - <source>Show the log of the local project</source> - <translation>Zobrazit log lokálního projektu</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation>Zobrazit dialog pro procházení logů lokálního projektu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation><b>Zobrazit log</b><p>Zobrazí log lokálního projektu.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> - <source>Show log browser</source> - <translation>Zobrazit log prohlížeč</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>Zobrazit dialog pro procházení logů lokálního projektu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> + <translation type="obsolete"><b>Zobrazit log</b><p>Zobrazí log lokálního projektu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Zobrazit log prohlížeč</b><p>Zobrazí se dialogové okno pro procházení logů lokálního projektu. Jako první je zobrazen limit maximálního přenosu. Více záznamů může být zobrazeno později.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show &difference</source> <translation>Zobrazit o&dlišnosti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> <source>Show the difference of the local project to the repository</source> <translation>Zobrazí odlišnosti mezi lokálním projektem a repozitářem</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Zobrazí odlišnosti mezi revizemi projektu v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> <source>Show status</source> <translation>Zobrazit status</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> <source>Show the status of the local project</source> <translation>Zobrazit status lokálního projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Zobrazit status</b><p>Zobrazí status lokálního projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> <source>Show heads</source> <translation>Zobrazit hlavy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Show the heads of the repository</source> <translation>Zobrazit ukazatele hlav repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Zobrazit ukazatele hlav</b><p>Zobrazí ukazatele hlav repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357"/> <source>Show parents</source> <translation>Zobrazit předky</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Show the parents of the repository</source> <translation>Zobrazit předky repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Zobrazit předky</b><p>Zobrazí předky repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="371"/> <source>Show tip</source> <translation>Zobrazit ukazatel tip</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <source>Show the tip of the repository</source> + <translation>Zobrazí ukazatel tip repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> + <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> + <translation><b>Zobrazit ukazatele tip</b><p>Zobrazí ukazatele tip repozitáře.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <source>Revert changes</source> + <translation>Vrátit změny</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <source>Re&vert changes</source> + <translation>&Vrátit změny</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> - <source>Show the tip of the repository</source> - <translation>Zobrazí ukazatel tip repozitáře</translation> + <source>Revert all changes made to the local project</source> + <translation>Vrátit všechny změny, které byly provedeny v lokálním projektu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> - <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> - <translation><b>Zobrazit ukazatele tip</b><p>Zobrazí ukazatele tip repozitáře.</p></translation> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation><b>Vrátit změny</b><p>Vrátí se všechny změny, které byly provedeny v lokálním projektu.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> - <source>Revert changes</source> - <translation>Vrátit změny</translation> + <source>Merge</source> + <translation>Sloučit</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> - <source>Re&vert changes</source> - <translation>&Vrátit změny</translation> + <source>Mer&ge changes...</source> + <translation>&Sloučit změny...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> - <source>Revert all changes made to the local project</source> - <translation>Vrátit všechny změny, které byly provedeny v lokálním projektu</translation> + <source>Merge changes of a revision into the local project</source> + <translation>Sloučí změny revize do lokálního projektu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation><b>Vrátit změny</b><p>Vrátí se všechny změny, které byly provedeny v lokálním projektu.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> - <source>Merge</source> - <translation>Sloučit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> - <source>Mer&ge changes...</source> - <translation>&Sloučit změny...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> - <source>Merge changes of a revision into the local project</source> - <translation>Sloučí změny revize do lokálního projektu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Sloučit</b><p>Sloučí se změny revize do lokálního projektu.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <source>Tag in repository</source> + <translation>Vytvořit tag v repozitáři</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <source>&Tag in repository...</source> + <translation>Vytvořit &tag v repozitáři...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <source>Tag the local project in the repository</source> + <translation>Vytvořit Tag - značku z lokálního projektu do repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Vytvořit tag v repozitáři</b><p>Z lokálního projektu vytvoří značku - tag v repozitáři.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> - <source>Tag in repository</source> - <translation>Vytvořit tag v repozitáři</translation> + <source>List tags</source> + <translation>Seznam tagů</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> - <source>&Tag in repository...</source> - <translation>Vytvořit &tag v repozitáři...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> - <source>Tag the local project in the repository</source> - <translation>Vytvořit Tag - značku z lokálního projektu do repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Vytvořit tag v repozitáři</b><p>Z lokálního projektu vytvoří značku - tag v repozitáři.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> - <source>List tags</source> - <translation>Seznam tagů</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags...</source> <translation>Seznam tagů...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> <source>List tags of the project</source> <translation>Seznam tagů projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Seznam tagů</b><p>Zobrazí seznam tagů projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>List branches</source> <translation>Seznam větví</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>List branches...</source> <translation>Seznam větví...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> + <source>List branches of the project</source> + <translation>Seznam větví projektu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Seznam větví</b><p>Zobrazí seznam větví projektu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create branch</source> + <translation>Vytvořit větev</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create &branch...</source> + <translation>Narou&bovat větev...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> - <source>List branches of the project</source> - <translation>Seznam větví projektu</translation> + <source>Create a new branch for the local project in the repository</source> + <translation>Vytvořit v repoziáři novou větev pro lokální projekt</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Seznam větví</b><p>Zobrazí seznam větví projektu.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Create branch</source> - <translation>Vytvořit větev</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Create &branch...</source> - <translation>Narou&bovat větev...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> - <source>Create a new branch for the local project in the repository</source> - <translation>Vytvořit v repoziáři novou větev pro lokální projekt</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Vytvořit větev</b><p>V repozitáři se vytvoří nová větev v lokálním projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> <source>Close branch</source> <translation>Zavřít větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> <source>Close the current branch of the local project</source> <translation>Zavře aktuální větev v lokálním projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Zavřít větev</b><p>Zavře aktuální větev v lokálním projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>Switch</source> <translation>Přepnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>S&witch...</source> <translation>&Přepnout...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <source>Switch the working directory to another revision</source> + <translation>Přepnout pracovní adresář do jiné revize</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation><b>Přepnout</b><p>Přepne pracovní adresář do jiné revize.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Cleanup</source> + <translation>Vyčistit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Cleanu&p</source> + <translation>Vy&prat</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Switch the working directory to another revision</source> - <translation>Přepnout pracovní adresář do jiné revize</translation> + <source>Cleanup the local project</source> + <translation>Vyčistit lokální projekt</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> - <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> - <translation><b>Přepnout</b><p>Přepne pracovní adresář do jiné revize.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source>Cleanup</source> - <translation>Vyčistit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source>Cleanu&p</source> - <translation>Vy&prat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> - <source>Cleanup the local project</source> - <translation>Vyčistit lokální projekt</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Vyčistit</b><p>Provede úklid lokálního projektu.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <source>Execute command</source> + <translation>Provést příkaz</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <source>E&xecute command...</source> + <translation>P&rovést příkaz...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <source>Execute an arbitrary Mercurial command</source> + <translation>Spustit libovolný Mercurial příkaz</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> + <translation><b>Provést příkaz</b><p>Otevře se dialogové okno pro zadání libovolného Mercurial příkazu.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>Execute command</source> - <translation>Provést příkaz</translation> + <source>Configure</source> + <translation>Konfigurovat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>E&xecute command...</source> - <translation>P&rovést příkaz...</translation> + <source>Configure...</source> + <translation>Konfigurovat...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> - <source>Execute an arbitrary Mercurial command</source> - <translation>Spustit libovolný Mercurial příkaz</translation> + <source>Show the configuration dialog with the Mercurial page selected</source> + <translation>Zobrazit konfigurační dialog s vybranou Mercurial stranou</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> - <translation><b>Provést příkaz</b><p>Otevře se dialogové okno pro zadání libovolného Mercurial příkazu.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Configure</source> - <translation>Konfigurovat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Configure...</source> - <translation>Konfigurovat...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> - <source>Show the configuration dialog with the Mercurial page selected</source> - <translation>Zobrazit konfigurační dialog s vybranou Mercurial stranou</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Konfigurovat</b><p>Zobrazit konfigurační dialog s vybranou Mercurial stranou.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths</source> <translation>Zobrazit cesty</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths...</source> <translation>Zobrazit cesty...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <source>Show the aliases for remote repositories</source> <translation>Zobrazit aliasy pro vzádelené repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Zobrazit cesty</b><p>Zobrazí aliasy vzdálených repozitářů.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository</source> <translation>Ověřit repozitář</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository...</source> <translation>Ověřit repozitář...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> <source>Verify the integrity of the repository</source> <translation>Ověřit integritu repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Ověřit integritu repozitáře</b><p>Ověří integritu repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover</source> <translation>Zotavit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover...</source> <translation>Zotavit...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> <source>Recover from an interrupted transaction</source> <translation>Zotavit z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Zotavit</b><p>Obnoví integritu repozitáře narušenou přerušenou transakcí.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> <source>Create .hgignore</source> <translation>Vytvořit .hgignore</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <source>Create a .hgignore file with default values</source> + <translation>Vytvořit soubor .hgignore s výchozími hodnotami</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation><p>Vytvořit .hgignore<br>Vytvoří soubor .hgignore s výchozími hodnotami.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup</source> + <translation>Vytvořit skupinu změn</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup...</source> + <translation>Vytvořit skupinu změn...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> - <source>Create a .hgignore file with default values</source> - <translation>Vytvořit soubor .hgignore s výchozími hodnotami</translation> + <source>Create changegroup file collecting changesets</source> + <translation>Vytvořit soubor s skupinou změn obsahující množinu změn</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1793"/> + <source>Apply changegroups</source> + <translation>Použít skupinu změn</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> + <source>Apply changegroups...</source> + <translation>Použít skupinu změn...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <source>Apply one or several changegroup files</source> + <translation>Použít soubory s jednou nebo více skupinami změn</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <source>Changegroup Management</source> + <translation>Správa skupin změn</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation><p>Vytvořit .hgignore<br>Vytvoří soubor .hgignore s výchozími hodnotami.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> - <source>Create changegroup</source> - <translation>Vytvořit skupinu změn</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> - <source>Create changegroup...</source> - <translation>Vytvořit skupinu změn...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> - <source>Create changegroup file collecting changesets</source> - <translation>Vytvořit soubor s skupinou změn obsahující množinu změn</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1810"/> - <source>Apply changegroups</source> - <translation>Použít skupinu změn</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> - <source>Apply changegroups...</source> - <translation>Použít skupinu změn...</translation> + <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> + <translation><b>Vytvořit skupin změn</b><p>Vytvoří soubor se skupinou změn obsahující vybrané množiny změn (hg bundle).</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> + <translation><b>Použít skupinu změn</b><p>Použije se soubor vygenerovaný příkazem 'Vytvořit skupinu změn', s jednou nebo více skupinami změn (hg unbundle)</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> + <source>Show current branch</source> + <translation>Zobrazit aktuální větev</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Show the current branch of the project</source> + <translation>Zobrazit aktuální větev projektu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation><b>Zobrazit aktuální větev</b><p>Zobrazí se aktuální větev projektu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <source>Mark as "good"</source> + <translation>Označit jako "v pořádku"</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> - <source>Apply one or several changegroup files</source> - <translation>Použít soubory s jednou nebo více skupinami změn</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1324"/> - <source>Changegroup Management</source> - <translation>Správa skupin změn</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> - <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> - <translation><b>Vytvořit skupin změn</b><p>Vytvoří soubor se skupinou změn obsahující vybrané množiny změn (hg bundle).</p></translation> + <source>Mark a selectable changeset as good</source> + <translation>Označit volitelnou množinu změn, že je v pořádku</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> - <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> - <translation><b>Použít skupinu změn</b><p>Použije se soubor vygenerovaný příkazem 'Vytvořit skupinu změn', s jednou nebo více skupinami změn (hg unbundle)</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> - <source>Show current branch</source> - <translation>Zobrazit aktuální větev</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> - <source>Show the current branch of the project</source> - <translation>Zobrazit aktuální větev projektu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation><b>Zobrazit aktuální větev</b><p>Zobrazí se aktuální větev projektu.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source>Mark as "good"</source> - <translation>Označit jako "v pořádku"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> - <source>Mark a selectable changeset as good</source> - <translation>Označit volitelnou množinu změn, že je v pořádku</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Označit jako "v pořádku"</b><p>Označí se volitelná množina změn, že je v pořádku.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source>Mark as "bad"</source> <translation>Označit jako "špatná"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> <source>Mark a selectable changeset as bad</source> <translation>Označit volitelnou množinu změn jako špatnou</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Označit jako "špatná"</b><p>Označí se volitelná množina změn, že je špatná.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <source>Skip</source> <translation>Přeskočit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> <source>Reset</source> <translation>Reset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> <source>Reset the bisect search data</source> <translation>Reset vyhledávání bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Reset</b><p>Zresetuje bisect vyhledávání v datech.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> <source>Mark as "good"...</source> <translation>Označit jako "v pořádku"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source>Mark as "bad"...</source> <translation>Označit jako "špatná"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> <source>Preview changegroup...</source> <translation>Náhled skupiny změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify</source> <translation>Identifikovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify...</source> <translation>Identifikovat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> <source>Identify the project directory</source> <translation>Identifikovat adresář projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identifikovat</b><p>Identifikuje se adresář projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Náhled souboru skupiny změn obsahující množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Náhled skupiny změn</b><p>Zobrazí náhled souboru skupiny změn obsahující množiny změn.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> <source>Back out changeset</source> <translation>Vycouvat z množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> <source>Back out changes of an earlier changeset</source> <translation>Vrátit změny z předchozí množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Vycouvat z množiny změn</b><p>Vrátit změny z předchozí množiny změn.</p></translation> </message> @@ -26679,687 +26789,687 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1300"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1627"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1610"/> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> <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/ProjectHelper.py" line="566"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <source>Show an editor to edit the repository configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Edit repository configuration</source> + <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Edit repository configuration...</source> + <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> - <source>Show an editor to edit the repository configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1849"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1316"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1869"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Export Patches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <source>Export revisions to patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> - <source>Export Patches</source> + <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> - <source>Export Patches...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1889"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> - <source>Change the phase of revisions</source> + <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> - <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1906"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1393"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/> - <source>Copy Changesets (Continue)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <source>Add</source> + <translation type="unfinished">Přidat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <source>Add...</source> + <translation type="unfinished">Přidat...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <source>Add a sub-repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Add</source> - <translation type="unfinished">Přidat</translation> + <source>Remove</source> + <translation type="unfinished">Odebrat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Add...</source> - <translation type="unfinished">Přidat...</translation> + <source>Remove...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> - <source>Add a sub-repository</source> + <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> - <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> - <source>Remove</source> - <translation type="unfinished">Odebrat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> - <source>Remove...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> - <source>Remove sub-repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> + <source>Show &status...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <source>Show Summary</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> - <source>Show &status...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> - <source>Show Summary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show summary...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> <source>Show summary information of the working directory status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> <source>Cancel uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> <source>Cancel an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <source>List bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <source>List bookmarks...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <source>List bookmarks of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>List bookmarks</source> + <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>List bookmarks...</source> + <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> - <source>List bookmarks of the project</source> + <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Define bookmark</source> + <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Define bookmark...</source> + <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> - <source>Define a bookmark for the project</source> + <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Delete bookmark</source> + <source>Rename bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Delete bookmark...</source> + <source>Rename bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <source>Delete a bookmark of the project</source> + <source>Rename a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Rename bookmark</source> + <source>Move bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Rename bookmark...</source> + <source>Move bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> - <source>Rename a bookmark of the project</source> + <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source>Move bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source>Move bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> - <source>Move a bookmark of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1144"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> <source>Show incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Pull bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> <source>Bookmarks</source> <translation type="unfinished">Záložky</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> <source>Tags</source> <translation type="unfinished">Tagy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <source>Re-Merge all conflicting, unresolved files of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> - <source>Re-Merge all conflicting, unresolved files of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Show conflicts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Show conflicts...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> - <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> - <source>Conflicts unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> - <source>Mark all conflicts of the local project as unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> - <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> - <source>Manage Changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> + <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <source>Mark all conflicts of the local project as unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> + <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> + <source>Manage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>Mercurial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> @@ -30427,6 +30537,42 @@ </message> </context> <context> + <name>HtmlProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/HtmlProvider.py" line="388"/> + <source>Create List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HtmlProvider.py" line="388"/> + <source>Enter desired number of list elements:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HyperlinkMarkupDialog</name> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="14"/> + <source>Insert Hyperlink</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="23"/> + <source>Link Text:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="33"/> + <source>Link Target:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="43"/> + <source>Link Title:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>IExplorerImporter</name> <message> <location filename="../WebBrowser/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="40"/> @@ -30628,1064 +30774,1089 @@ <translation>Windows Bitmap soubor (*.bmp)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="128"/> + <location filename="../IconEditor/IconEditorWindow.py" line="130"/> <source>Graphic Interchange Format File (*.gif)</source> <translation>Graphic Interchange Format soubor (*.gif)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="129"/> + <location filename="../IconEditor/IconEditorWindow.py" line="132"/> <source>Windows Icon File (*.ico)</source> <translation>Windows Icon soubor (*.ico)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="130"/> + <location filename="../IconEditor/IconEditorWindow.py" line="134"/> <source>JPEG File (*.jpg)</source> <translation>JPEG soubor (*.jpg)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="133"/> - <source>Portable Bitmap File (*.pbm)</source> - <translation>Portable Bitmap soubor (*.pbm)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="135"/> - <source>Portable Graymap File (*.pgm)</source> - <translation>Portable Graymap soubor (*.pgm)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="136"/> - <source>Portable Network Graphics File (*.png)</source> - <translation>Portable Network Graphics soubor (*.png)</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="137"/> - <source>Portable Pixmap File (*.ppm)</source> - <translation>Portable Pixmap soubor (*.ppm)</translation> + <source>Portable Bitmap File (*.pbm)</source> + <translation>Portable Bitmap soubor (*.pbm)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="139"/> - <source>Scalable Vector Graphics File (*.svg)</source> - <translation>Scalable Vector Graphics soubor (*.svg)</translation> + <source>Portable Graymap File (*.pgm)</source> + <translation>Portable Graymap soubor (*.pgm)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="140"/> + <source>Portable Network Graphics File (*.png)</source> + <translation>Portable Network Graphics soubor (*.png)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="141"/> + <source>Portable Pixmap File (*.ppm)</source> + <translation>Portable Pixmap soubor (*.ppm)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="143"/> - <source>TIFF File (*.tif)</source> - <translation>TIFF soubor (*.tif)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="146"/> - <source>X11 Bitmap File (*.xbm)</source> - <translation>X11 Bitmap soubor (*.xbm)</translation> + <source>Scalable Vector Graphics File (*.svg)</source> + <translation>Scalable Vector Graphics soubor (*.svg)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="147"/> + <source>TIFF File (*.tif)</source> + <translation>TIFF soubor (*.tif)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="151"/> + <source>X11 Bitmap File (*.xbm)</source> + <translation>X11 Bitmap soubor (*.xbm)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="152"/> <source>X11 Pixmap File (*.xpm)</source> <translation>X11 Pixmap soubor (*.xpm)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="158"/> + <location filename="../IconEditor/IconEditorWindow.py" line="163"/> <source>All Files (*)</source> <translation>Všechny soubory (*)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>New</source> <translation>Nový</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>&New</source> <translation>&Nový</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>Ctrl+N</source> <comment>File|New</comment> <translation></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="196"/> + <location filename="../IconEditor/IconEditorWindow.py" line="201"/> <source>Create a new icon</source> <translation>Vytvořit novou ikonu</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="197"/> + <location filename="../IconEditor/IconEditorWindow.py" line="202"/> <source><b>New</b><p>This creates a new icon.</p></source> <translation><b>Nová</b><p>Vytvoří se nová ikona.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="204"/> + <location filename="../IconEditor/IconEditorWindow.py" line="209"/> <source>New Window</source> <translation>Nové okno</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="204"/> - <source>New &Window</source> - <translation>&Nové okno</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="209"/> + <source>New &Window</source> + <translation>&Nové okno</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="214"/> <source>Open a new icon editor window</source> <translation>Otevřít nové editační okno s ikonou</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="211"/> + <location filename="../IconEditor/IconEditorWindow.py" line="216"/> <source><b>New Window</b><p>This opens a new icon editor window.</p></source> <translation><b>Nové okno</b><p>Otevřít nové editační okno s ikonou.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>Open</source> <translation>Otevřít</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>&Open...</source> <translation>&Otevřít...</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>Ctrl+O</source> <comment>File|Open</comment> <translation></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="224"/> + <location filename="../IconEditor/IconEditorWindow.py" line="229"/> <source>Open an icon file for editing</source> <translation>Otevřít soubor s ikonou pro editaci</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="225"/> + <location filename="../IconEditor/IconEditorWindow.py" line="230"/> <source><b>Open File</b><p>This opens a new icon file for editing. It pops up a file selection dialog.</p></source> <translation><b>Otevřít soubor</b><p>Otevře soubor s ikonou pro editaci. Spustí se přes dialog pro výběr souboru.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>Save</source> <translation>Uložit</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>&Save</source> <translation>&Uložit</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>Ctrl+S</source> <comment>File|Save</comment> <translation></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="239"/> + <location filename="../IconEditor/IconEditorWindow.py" line="244"/> <source>Save the current icon</source> <translation>Uložit aktuální ikonu</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="240"/> + <location filename="../IconEditor/IconEditorWindow.py" line="245"/> <source><b>Save File</b><p>Save the contents of the icon editor window.</p></source> <translation><b>Uložit soubor</b><p>Uložit obsah aktuálního editačního okna s ikonou.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Save As</source> <translation>Uložit jako</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Save &As...</source> <translation>Uložit j&ako...</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Shift+Ctrl+S</source> <comment>File|Save As</comment> <translation></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="253"/> + <location filename="../IconEditor/IconEditorWindow.py" line="258"/> <source>Save the current icon to a new file</source> <translation>Uložit aktuální ikonu do nového souboru</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="255"/> + <location filename="../IconEditor/IconEditorWindow.py" line="260"/> <source><b>Save As...</b><p>Saves the current icon to a new file.</p></source> <translation><b>Uložit jako</b><p>Uloží aktuální ikonu do nového souboru.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>Close</source> <translation>Zavřít</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>&Close</source> <translation>&Zavřít</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>Ctrl+W</source> <comment>File|Close</comment> <translation></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="268"/> + <location filename="../IconEditor/IconEditorWindow.py" line="273"/> <source>Close the current icon editor window</source> <translation>Zavřít aktuální okno editoru ikon</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="270"/> + <location filename="../IconEditor/IconEditorWindow.py" line="275"/> <source><b>Close</b><p>Closes the current icon editor window.</p></source> <translation><b>Zavřít</b><p>Zavře aktuální okno editoru ikon.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="277"/> + <location filename="../IconEditor/IconEditorWindow.py" line="282"/> <source>Close All</source> <translation>Zavřít vše</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="277"/> + <location filename="../IconEditor/IconEditorWindow.py" line="282"/> <source>Close &All</source> <translation>Z&avřít vše</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="281"/> + <location filename="../IconEditor/IconEditorWindow.py" line="286"/> <source>Close all icon editor windows</source> <translation>Zavřít všechny editační okna ikon</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="283"/> + <location filename="../IconEditor/IconEditorWindow.py" line="288"/> <source><b>Close All</b><p>Closes all icon editor windows except the first one.</p></source> <translation><b>Zavřít vše</b><p>Zavřít všechna okna editorů ikon kromě prvního.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>Quit</source> <translation>Konec</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>&Quit</source> <translation>&Konec</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>Ctrl+Q</source> <comment>File|Quit</comment> <translation></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="309"/> + <location filename="../IconEditor/IconEditorWindow.py" line="314"/> <source>Quit the icon editor</source> <translation>Ukončit editor ikon</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="310"/> + <location filename="../IconEditor/IconEditorWindow.py" line="315"/> <source><b>Quit</b><p>Quit the icon editor.</p></source> <translation><b>Konec</b><p>Ukončit editor ikon.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Undo</source> <translation>Vrátit</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>&Undo</source> <translation>&Vrátit</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Ctrl+Z</source> <comment>Edit|Undo</comment> <translation></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Alt+Backspace</source> <comment>Edit|Undo</comment> <translation></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="329"/> + <location filename="../IconEditor/IconEditorWindow.py" line="334"/> <source>Undo the last change</source> <translation>Vrátit poslední změnu</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="330"/> + <location filename="../IconEditor/IconEditorWindow.py" line="335"/> <source><b>Undo</b><p>Undo the last change done.</p></source> <translation><b>Vrátit</b><p>Vrátit poslední změnu.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>Redo</source> <translation>Znovu použít</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>&Redo</source> <translation>&Znovu použít</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>Ctrl+Shift+Z</source> <comment>Edit|Redo</comment> <translation></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="343"/> + <location filename="../IconEditor/IconEditorWindow.py" line="348"/> <source>Redo the last change</source> <translation>Znovu použít poslední změnu</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="344"/> + <location filename="../IconEditor/IconEditorWindow.py" line="349"/> <source><b>Redo</b><p>Redo the last change done.</p></source> <translation><b>Znovu použít</b><p>Znovu použít poslední změnu.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Cut</source> <translation>Vyjmout</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Cu&t</source> <translation>Vyjmou&t</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Ctrl+X</source> <comment>Edit|Cut</comment> <translation></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Shift+Del</source> <comment>Edit|Cut</comment> <translation></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="358"/> + <location filename="../IconEditor/IconEditorWindow.py" line="363"/> <source>Cut the selection</source> <translation>Vyjmout výběr</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="359"/> + <location filename="../IconEditor/IconEditorWindow.py" line="364"/> <source><b>Cut</b><p>Cut the selected image area to the clipboard.</p></source> <translation><b>Vyjmout</b><p>Vyjme vybranou oblast obrázku a vloží jej do schránky.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Copy</source> <translation>Kopírovat</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>&Copy</source> <translation>&Kopírovat</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Ctrl+C</source> <comment>Edit|Copy</comment> <translation></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Ctrl+Ins</source> <comment>Edit|Copy</comment> <translation></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="373"/> + <location filename="../IconEditor/IconEditorWindow.py" line="378"/> <source>Copy the selection</source> <translation>Kopírovat výběr</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="374"/> + <location filename="../IconEditor/IconEditorWindow.py" line="379"/> <source><b>Copy</b><p>Copy the selected image area to the clipboard.</p></source> <translation><b>Kopírovat</b><p>Kopíruje vybranou oblast obrázku a vloží ji do schránky.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Paste</source> <translation>Vložit</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>&Paste</source> <translation>V&ložit</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Ctrl+V</source> <comment>Edit|Paste</comment> <translation></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Shift+Ins</source> <comment>Edit|Paste</comment> <translation></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="388"/> + <location filename="../IconEditor/IconEditorWindow.py" line="393"/> <source>Paste the clipboard image</source> <translation>Vložit obrázek ze schránky</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="389"/> + <location filename="../IconEditor/IconEditorWindow.py" line="394"/> <source><b>Paste</b><p>Paste the clipboard image.</p></source> <translation><b>Vložit</b><p>Vložit obrázek ze schránky.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="396"/> + <location filename="../IconEditor/IconEditorWindow.py" line="401"/> <source>Paste as New</source> <translation>Vložit jako nový</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="396"/> + <location filename="../IconEditor/IconEditorWindow.py" line="401"/> <source>Paste as &New</source> <translation>Vložit jako &nový</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="400"/> + <location filename="../IconEditor/IconEditorWindow.py" line="405"/> <source>Paste the clipboard image replacing the current one</source> <translation>Nahradit aktuální obrázek tím ze schránky</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="402"/> + <location filename="../IconEditor/IconEditorWindow.py" line="407"/> <source><b>Paste as New</b><p>Paste the clipboard image replacing the current one.</p></source> <translation><b>Vložit jako nový</b><p>Obrázek ze schránky nahradí aktuální obrázek.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Clear</source> <translation>Vyčistit</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Cl&ear</source> <translation>Vyči&stit</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Alt+Shift+C</source> <comment>Edit|Clear</comment> <translation></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="416"/> + <location filename="../IconEditor/IconEditorWindow.py" line="421"/> <source>Clear the icon image</source> <translation>Vymazat obrázek ikony</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="417"/> + <location filename="../IconEditor/IconEditorWindow.py" line="422"/> <source><b>Clear</b><p>Clear the icon image and set it to be completely transparent.</p></source> <translation><b>Vymazat</b><p>Vymaže obrázek ikony a nastaví jej jako zcela průhledný.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>Select All</source> <translation>Vybrat vše</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>&Select All</source> <translation>Vybrat vš&e</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>Ctrl+A</source> <comment>Edit|Select All</comment> <translation></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="431"/> + <location filename="../IconEditor/IconEditorWindow.py" line="436"/> <source>Select the complete icon image</source> <translation>Vybrat celý obrázek ikony</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="433"/> + <location filename="../IconEditor/IconEditorWindow.py" line="438"/> <source><b>Select All</b><p>Selects the complete icon image.</p></source> <translation><b>Vybrat celý</b><p>Vybere kopletně celý obrázek ikony.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="440"/> + <location filename="../IconEditor/IconEditorWindow.py" line="445"/> <source>Change Size</source> <translation>Změnit velikost</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="440"/> + <location filename="../IconEditor/IconEditorWindow.py" line="445"/> <source>Change Si&ze...</source> <translation>&Změnit velikost...</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="446"/> + <location filename="../IconEditor/IconEditorWindow.py" line="451"/> <source>Change the icon size</source> <translation>Změnit velikost ikony</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="447"/> + <location filename="../IconEditor/IconEditorWindow.py" line="452"/> <source><b>Change Size...</b><p>Changes the icon size.</p></source> <translation><b>Změnit velikost......</b><p>Změnit velikost ikony.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="454"/> + <location filename="../IconEditor/IconEditorWindow.py" line="459"/> <source>Grayscale</source> <translation>Stupnice šedi</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="454"/> + <location filename="../IconEditor/IconEditorWindow.py" line="459"/> <source>&Grayscale</source> <translation>&Stupnice šedi</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="460"/> + <location filename="../IconEditor/IconEditorWindow.py" line="465"/> <source>Change the icon to grayscale</source> <translation>Převést ikonu do šedi</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="462"/> + <location filename="../IconEditor/IconEditorWindow.py" line="467"/> <source><b>Grayscale</b><p>Changes the icon to grayscale.</p></source> <translation><b>Stupnice šedi</b><p>Převést ikonu do šedi.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Zoom in</source> <translation>Přiblížit</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Zoom &in</source> <translation>Př&iblížit</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Ctrl++</source> <comment>View|Zoom in</comment> <translation></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="497"/> + <location filename="../IconEditor/IconEditorWindow.py" line="502"/> <source>Zoom in on the icon</source> <translation>Přiblížit ikonu</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="498"/> + <location filename="../IconEditor/IconEditorWindow.py" line="503"/> <source><b>Zoom in</b><p>Zoom in on the icon. This makes the grid bigger.</p></source> <translation><b>Přiblížit</b><p>Přiblížit ikonu. Pomocná síť bude větší.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Zoom out</source> <translation>Oddálit</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Zoom &out</source> <translation>&Oddálit</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Ctrl+-</source> <comment>View|Zoom out</comment> <translation></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="511"/> + <location filename="../IconEditor/IconEditorWindow.py" line="516"/> <source>Zoom out on the icon</source> <translation>Oddálit ikonu</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="512"/> + <location filename="../IconEditor/IconEditorWindow.py" line="517"/> <source><b>Zoom out</b><p>Zoom out on the icon. This makes the grid smaller.</p></source> <translation><b>Oddálit</b><p>Lupa na oddálení ikony. Pomocná síť bude menší.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Zoom reset</source> <translation>Resetovat lupu</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Zoom &reset</source> <translation>&Resetovat lupu</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Ctrl+0</source> <comment>View|Zoom reset</comment> <translation></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="535"/> + <location filename="../IconEditor/IconEditorWindow.py" line="540"/> <source>Show Grid</source> <translation>Zobrazit pomocnou síť</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="535"/> + <location filename="../IconEditor/IconEditorWindow.py" line="540"/> <source>Show &Grid</source> <translation>Zobrazit pomocnou &síť</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="541"/> + <location filename="../IconEditor/IconEditorWindow.py" line="546"/> <source>Toggle the display of the grid</source> <translation>Přepnout zobrazování pomocné sítě</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="543"/> + <location filename="../IconEditor/IconEditorWindow.py" line="548"/> <source><b>Show Grid</b><p>Toggle the display of the grid.</p></source> <translation><b>Zobrazit pomocnou síť</b><p>Přepíná zobrazování pomocné sítě.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="562"/> + <location filename="../IconEditor/IconEditorWindow.py" line="567"/> <source>Freehand</source> <translation>Od ruky</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="562"/> + <location filename="../IconEditor/IconEditorWindow.py" line="567"/> <source>&Freehand</source> <translation>Od &ruky</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="568"/> + <location filename="../IconEditor/IconEditorWindow.py" line="573"/> <source><b>Free hand</b><p>Draws non linear lines.</p></source> <translation><b>Od ruky</b><p>Kreslí čáry od ruky.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="577"/> + <location filename="../IconEditor/IconEditorWindow.py" line="582"/> <source>Color Picker</source> <translation>Barvítko</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="577"/> + <location filename="../IconEditor/IconEditorWindow.py" line="582"/> <source>&Color Picker</source> <translation>&Barvítko</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="583"/> + <location filename="../IconEditor/IconEditorWindow.py" line="588"/> <source><b>Color Picker</b><p>The color of the pixel clicked on will become the current draw color.</p></source> <translation><b>Barvítko</b><p>Barva pixelu, na kterou se klikne, se změní na aktuálně nastavenou barvu.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="594"/> + <location filename="../IconEditor/IconEditorWindow.py" line="599"/> <source>Rectangle</source> <translation>Obdélník</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="594"/> + <location filename="../IconEditor/IconEditorWindow.py" line="599"/> <source>&Rectangle</source> <translation>&Obdélník</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="600"/> + <location filename="../IconEditor/IconEditorWindow.py" line="605"/> <source><b>Rectangle</b><p>Draw a rectangle.</p></source> <translation><b>Obdélník</b><p>Kreslit obdélník.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="609"/> + <location filename="../IconEditor/IconEditorWindow.py" line="614"/> <source>Filled Rectangle</source> <translation>Vyplněný obdélník</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="609"/> + <location filename="../IconEditor/IconEditorWindow.py" line="614"/> <source>F&illed Rectangle</source> <translation>Vyplněný o&bdélník</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="615"/> + <location filename="../IconEditor/IconEditorWindow.py" line="620"/> <source><b>Filled Rectangle</b><p>Draw a filled rectangle.</p></source> <translation><b>vyplněný obdélník</b><p>Kreslit obdélník vyplněný barvou.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="625"/> + <location filename="../IconEditor/IconEditorWindow.py" line="630"/> <source>Circle</source> <translation>Kruh</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="631"/> + <location filename="../IconEditor/IconEditorWindow.py" line="636"/> <source><b>Circle</b><p>Draw a circle.</p></source> <translation><b>Kruh</b><p>Nakreslit kruh.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="640"/> + <location filename="../IconEditor/IconEditorWindow.py" line="645"/> <source>Filled Circle</source> <translation>Vyplněný kruh</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="640"/> + <location filename="../IconEditor/IconEditorWindow.py" line="645"/> <source>Fille&d Circle</source> <translation>Vyplněný k&ruh</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="646"/> + <location filename="../IconEditor/IconEditorWindow.py" line="651"/> <source><b>Filled Circle</b><p>Draw a filled circle.</p></source> <translation><b>Vyplněný kruh</b><p>Nakreslit kruh vypněný barvou.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="656"/> + <location filename="../IconEditor/IconEditorWindow.py" line="661"/> <source>Ellipse</source> <translation>Elipsa</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="656"/> + <location filename="../IconEditor/IconEditorWindow.py" line="661"/> <source>&Ellipse</source> <translation>&Elipsa</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="662"/> + <location filename="../IconEditor/IconEditorWindow.py" line="667"/> <source><b>Ellipse</b><p>Draw an ellipse.</p></source> <translation><b>Elipsa</b><p>Nakreslit elipsu.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="671"/> + <location filename="../IconEditor/IconEditorWindow.py" line="676"/> <source>Filled Ellipse</source> <translation>Vyplněná elipsa</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="671"/> + <location filename="../IconEditor/IconEditorWindow.py" line="676"/> <source>Fille&d Elli&pse</source> <translation>Vyplněná e&lipsa</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="677"/> + <location filename="../IconEditor/IconEditorWindow.py" line="682"/> <source><b>Filled Ellipse</b><p>Draw a filled ellipse.</p></source> <translation><b>Vyplněná elipsa</b><p>Nakreslit elipsu vypněnou barvou.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="687"/> + <location filename="../IconEditor/IconEditorWindow.py" line="692"/> <source>Flood Fill</source> <translation>Vyplnit</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="687"/> + <location filename="../IconEditor/IconEditorWindow.py" line="692"/> <source>Fl&ood Fill</source> <translation>&Vyplnit</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="693"/> + <location filename="../IconEditor/IconEditorWindow.py" line="698"/> <source><b>Flood Fill</b><p>Fill adjoining pixels with the same color with the current color.</p></source> <translation><b>Vyplit</b><p>Vyplní barvou celou ohraničenou plochu, ve které se nachází počáteční pixel (semínkové vyplňování).</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="703"/> + <location filename="../IconEditor/IconEditorWindow.py" line="708"/> <source>Line</source> <translation>Linka</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="703"/> + <location filename="../IconEditor/IconEditorWindow.py" line="708"/> <source>&Line</source> <translation>&Linka</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="709"/> + <location filename="../IconEditor/IconEditorWindow.py" line="714"/> <source><b>Line</b><p>Draw a line.</p></source> <translation><b>Linka</b><p>Nakreslit linku.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="718"/> + <location filename="../IconEditor/IconEditorWindow.py" line="723"/> <source>Eraser (Transparent)</source> <translation>Guma (průhlednost)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="718"/> + <location filename="../IconEditor/IconEditorWindow.py" line="723"/> <source>Eraser (&Transparent)</source> <translation>Guma (průhlednos&t)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="724"/> + <location filename="../IconEditor/IconEditorWindow.py" line="729"/> <source><b>Eraser (Transparent)</b><p>Erase pixels by setting them to transparent.</p></source> <translation><b>Guma (průhlednost)</b><p>Vymaže pixely tak, že budou průhledné.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="733"/> + <location filename="../IconEditor/IconEditorWindow.py" line="738"/> <source>Rectangular Selection</source> <translation>Obdélníkový výběr</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="750"/> + <location filename="../IconEditor/IconEditorWindow.py" line="755"/> <source>Rect&angular Selection</source> <translation>&Obdélníkový výběr</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="739"/> + <location filename="../IconEditor/IconEditorWindow.py" line="744"/> <source><b>Rectangular Selection</b><p>Select a rectangular section of the icon using the mouse.</p></source> <translation><b>Obdélníkový výběr</b><p>Vybrat obdélníkovou oblast v ikoně pomocí myši.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="750"/> + <location filename="../IconEditor/IconEditorWindow.py" line="755"/> <source>Circular Selection</source> <translation>Kruhový výběr</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="756"/> + <location filename="../IconEditor/IconEditorWindow.py" line="761"/> <source><b>Circular Selection</b><p>Select a circular section of the icon using the mouse.</p></source> <translation><b>Kruhový výběr</b><p>Vybrat kruhovou oblast v ikoně pomocí myši.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="773"/> + <location filename="../IconEditor/IconEditorWindow.py" line="778"/> <source>About</source> <translation>O aplikaci</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="773"/> + <location filename="../IconEditor/IconEditorWindow.py" line="778"/> <source>&About</source> <translation>O &aplikaci</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="777"/> + <location filename="../IconEditor/IconEditorWindow.py" line="782"/> <source>Display information about this software</source> <translation>Zobrazit informace a tomto software</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="779"/> + <location filename="../IconEditor/IconEditorWindow.py" line="784"/> <source><b>About</b><p>Display some information about this software.</p></source> <translation><b>O aplikaci</b><p>Zobrazí se informace o tomto software.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="785"/> + <location filename="../IconEditor/IconEditorWindow.py" line="790"/> <source>About Qt</source> <translation>O Qt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="785"/> + <location filename="../IconEditor/IconEditorWindow.py" line="790"/> <source>About &Qt</source> <translation>O &Qt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="789"/> + <location filename="../IconEditor/IconEditorWindow.py" line="794"/> <source>Display information about the Qt toolkit</source> <translation>Zobrazit informace o Qt toolkitu</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="791"/> + <location filename="../IconEditor/IconEditorWindow.py" line="796"/> <source><b>About Qt</b><p>Display some information about the Qt toolkit.</p></source> <translation><b>O Qt</b><p>Zobrazit informace o Qt toolkitu.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>What's This?</source> <translation>Co je to?</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>&What's This?</source> <translation>&Co je to?</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>Shift+F1</source> <comment>Help|What's This?'</comment> <translation></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="804"/> + <location filename="../IconEditor/IconEditorWindow.py" line="809"/> <source>Context sensitive help</source> <translation>Kontextově senzitivní nápověda</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="805"/> + <location filename="../IconEditor/IconEditorWindow.py" line="810"/> <source><b>Display context sensitive help</b><p>In What's This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.</p></source> <translation><b>Zobrazit kontextově senzitivní nápovědu</b><p>V režimu "Co je to?" se nad různými prvky aplikace u kurzoru zobrazí otazník. Když pak kliknete na tyto prvky, zobrazí se krátký popis co daný prvek znamená a jak jej použít. V dialogových oknech se tato funkce spustí tlačítkem kontextové nápovědy na horní liště.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="822"/> + <location filename="../IconEditor/IconEditorWindow.py" line="827"/> <source>&File</source> <translation>S&oubor</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="839"/> + <location filename="../IconEditor/IconEditorWindow.py" line="844"/> <source>&Edit</source> <translation>&Edit</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="855"/> + <location filename="../IconEditor/IconEditorWindow.py" line="860"/> <source>&View</source> <translation>Poh&led</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="863"/> + <location filename="../IconEditor/IconEditorWindow.py" line="868"/> <source>&Tools</source> <translation>&Nástroje</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="882"/> + <location filename="../IconEditor/IconEditorWindow.py" line="887"/> <source>&Help</source> <translation>&Nápověda</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="892"/> + <location filename="../IconEditor/IconEditorWindow.py" line="897"/> <source>File</source> <translation>Soubor</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="906"/> + <location filename="../IconEditor/IconEditorWindow.py" line="911"/> <source>Edit</source> <translation>Editovat</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="919"/> - <source>View</source> - <translation>Pohled</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="924"/> + <source>View</source> + <translation>Pohled</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="929"/> <source>Tools</source> <translation>Nástroje</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="942"/> + <location filename="../IconEditor/IconEditorWindow.py" line="947"/> <source>Help</source> <translation>Nápověda</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="956"/> + <location filename="../IconEditor/IconEditorWindow.py" line="961"/> <source><p>This part of the status bar displays the icon size.</p></source> <translation><p>Tato část status baru zobrazuje velikost ikony.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="963"/> + <location filename="../IconEditor/IconEditorWindow.py" line="968"/> <source><p>This part of the status bar displays the cursor position.</p></source> <translation><p>Tato část status baru zobrazuje pozici kurzoru.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1059"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1064"/> <source>Open icon file</source> <translation>Otevřít soubor s ikonou</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1109"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1114"/> <source>Save icon file</source> <translation>Uložit ikonu do souboru</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1198"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1203"/> <source>Icon saved</source> <translation>Ikona uložena</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1213"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1218"/> <source>Untitled</source> <translation>Beze jména</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1217"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1222"/> <source>Icon Editor</source> <translation>Editor ikon</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="132"/> + <location filename="../IconEditor/IconEditorWindow.py" line="136"/> <source>Multiple-Image Network Graphics File (*.mng)</source> <translation>Multiple-Image Network Graphics soubor (*.mng)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="525"/> + <location filename="../IconEditor/IconEditorWindow.py" line="530"/> <source>Reset the zoom of the icon</source> <translation>Resetovat lupu ikony</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="527"/> + <location filename="../IconEditor/IconEditorWindow.py" line="532"/> <source><b>Zoom reset</b><p>Reset the zoom of the icon. This sets the zoom factor to 100%.</p></source> <translation><b>Reset lupy</b><p>Reset lupy pro ikonu. Nastaví se lupa na hodnotu 100%.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="134"/> - <source>Paintbrush Bitmap File (*.pcx)</source> - <translation>Paintbrush Bitmap soubor (*.pcx)</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="138"/> - <source>Silicon Graphics Image File (*.sgi)</source> - <translation>Silicon Graphics Image soubor (*.sgi)</translation> + <source>Paintbrush Bitmap File (*.pcx)</source> + <translation>Paintbrush Bitmap soubor (*.pcx)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="142"/> + <source>Silicon Graphics Image File (*.sgi)</source> + <translation>Silicon Graphics Image soubor (*.sgi)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="146"/> <source>Targa Graphic File (*.tga)</source> <translation>Targa Graphic soubor (*.tga)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1145"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1150"/> <source>The file '{0}' does not exist.</source> <translation>Soubor '{0}' neexistuje.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1152"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1157"/> <source>Cannot read file '{0}: {1}.</source> <translation>Nelze číst soubor '{0}:{1}.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1186"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1191"/> <source>Cannot write file '{0}: {1}.</source> <translation>Nelze zapsat do souboru '{0}: {1}.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1217"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1222"/> <source>{0}[*] - {1}</source> <translation></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1109"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1114"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1238"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1243"/> <source>The icon image has unsaved changes.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="131"/> + <location filename="../IconEditor/IconEditorWindow.py" line="135"/> <source>JPEG File (*.jpeg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="140"/> - <source>Compressed Scalable Vector Graphics File (*.svgz)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="144"/> + <source>Compressed Scalable Vector Graphics File (*.svgz)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="148"/> <source>TIFF File (*.tiff)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="145"/> + <location filename="../IconEditor/IconEditorWindow.py" line="149"/> <source>WAP Bitmap File (*.wbmp)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1238"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1243"/> <source>eric6 Icon Editor</source> <translation type="unfinished">eric5 editor ikon {6 ?}</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1328"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1333"/> <source>About eric6 Icon Editor</source> <translation type="unfinished">O eric5 editoru ikon {6 ?}</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1328"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1333"/> <source>The eric6 Icon Editor is a simple editor component to perform icon drawing tasks.</source> <translation type="unfinished">Eric5 editor ikon je jednoduchý editor pro kreslení ikon. {6 ?}</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="290"/> + <location filename="../IconEditor/IconEditorWindow.py" line="295"/> <source>Close Others</source> <translation type="unfinished">Zavřít ostatní</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="294"/> + <location filename="../IconEditor/IconEditorWindow.py" line="299"/> <source>Close all other icon editor windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="296"/> + <location filename="../IconEditor/IconEditorWindow.py" line="301"/> <source><b>Close Others</b><p>Closes all other icon editor windows.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="150"/> + <source>WebP Image File (*.webp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="128"/> + <source>Windows Cursor File (*.cur)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="129"/> + <source>DirectDraw-Surface File (*.dds)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="131"/> + <source>Apple Icon File (*.icns)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="133"/> + <source>JPEG2000 File (*.jp2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>IconSizeDialog</name> @@ -31792,6 +31963,189 @@ </message> </context> <context> + <name>ImageMarkupDialog</name> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="53"/> + <source>Windows Bitmap File (*.bmp)</source> + <translation type="unfinished">Windows Bitmap soubor (*.bmp)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="54"/> + <source>Windows Cursor File (*.cur)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="55"/> + <source>DirectDraw-Surface File (*.dds)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="56"/> + <source>Graphic Interchange Format File (*.gif)</source> + <translation type="unfinished">Graphic Interchange Format soubor (*.gif)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="57"/> + <source>Apple Icon File (*.icns)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="58"/> + <source>Windows Icon File (*.ico)</source> + <translation type="unfinished">Windows Icon soubor (*.ico)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="59"/> + <source>JPEG2000 File (*.jp2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="60"/> + <source>JPEG File (*.jpg)</source> + <translation type="unfinished">JPEG soubor (*.jpg)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="61"/> + <source>JPEG File (*.jpeg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="62"/> + <source>Multiple-Image Network Graphics File (*.mng)</source> + <translation type="unfinished">Multiple-Image Network Graphics soubor (*.mng)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="63"/> + <source>Portable Bitmap File (*.pbm)</source> + <translation type="unfinished">Portable Bitmap soubor (*.pbm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="64"/> + <source>Paintbrush Bitmap File (*.pcx)</source> + <translation type="unfinished">Paintbrush Bitmap soubor (*.pcx)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="65"/> + <source>Portable Graymap File (*.pgm)</source> + <translation type="unfinished">Portable Graymap soubor (*.pgm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="66"/> + <source>Portable Network Graphics File (*.png)</source> + <translation type="unfinished">Portable Network Graphics soubor (*.png)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="67"/> + <source>Portable Pixmap File (*.ppm)</source> + <translation type="unfinished">Portable Pixmap soubor (*.ppm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="68"/> + <source>Silicon Graphics Image File (*.sgi)</source> + <translation type="unfinished">Silicon Graphics Image soubor (*.sgi)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="69"/> + <source>Scalable Vector Graphics File (*.svg)</source> + <translation type="unfinished">Scalable Vector Graphics soubor (*.svg)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="70"/> + <source>Compressed Scalable Vector Graphics File (*.svgz)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="72"/> + <source>Targa Graphic File (*.tga)</source> + <translation type="unfinished">Targa Graphic soubor (*.tga)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="73"/> + <source>TIFF File (*.tif)</source> + <translation type="unfinished">TIFF soubor (*.tif)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="74"/> + <source>TIFF File (*.tiff)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="75"/> + <source>WAP Bitmap File (*.wbmp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="76"/> + <source>WebP Image File (*.webp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="77"/> + <source>X11 Bitmap File (*.xbm)</source> + <translation type="unfinished">X11 Bitmap soubor (*.xbm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="78"/> + <source>X11 Pixmap File (*.xpm)</source> + <translation type="unfinished">X11 Pixmap soubor (*.xpm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="89"/> + <source>All Files (*)</source> + <translation type="unfinished">Všechny soubory (*)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="14"/> + <source>Add Image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="25"/> + <source>Image Address:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="41"/> + <source>Enter the image path or URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="48"/> + <source>Title:</source> + <translation type="unfinished">Titulek:</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="58"/> + <source>Alternative Text:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="73"/> + <source>Keep Original Size</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="80"/> + <source>Keep Aspect Ratio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="89"/> + <source>Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="119"/> + <source> px</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="109"/> + <source>Height:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ImagesIcon</name> <message> <location filename="../WebBrowser/StatusBar/ImagesIcon.py" line="40"/> @@ -34703,7 +35057,7 @@ <translation>Výběr alternativního lexeru pro spojení</translation> </message> <message> - <location filename="../Project/LexerAssociationDialog.py" line="131"/> + <location filename="../Project/LexerAssociationDialog.py" line="134"/> <source>Alternative</source> <translation>Alternativa</translation> </message> @@ -35039,317 +35393,317 @@ <translation></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="117"/> + <location filename="../QScintilla/Lexers/__init__.py" line="121"/> <source>Perl</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="121"/> + <location filename="../QScintilla/Lexers/__init__.py" line="125"/> <source>Povray</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="123"/> + <location filename="../QScintilla/Lexers/__init__.py" line="127"/> <source>Properties</source> <translation>Nastavení</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="131"/> + <location filename="../QScintilla/Lexers/__init__.py" line="135"/> <source>Ruby</source> <translation>Ruby</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="133"/> - <source>SQL</source> - <translation></translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="137"/> + <source>SQL</source> + <translation></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="141"/> <source>TeX</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="139"/> + <location filename="../QScintilla/Lexers/__init__.py" line="143"/> <source>VHDL</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="547"/> + <location filename="../QScintilla/Lexers/__init__.py" line="565"/> <source>Pyrex Files (*.pyx)</source> <translation>Pyrex soubory (*.pyx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="550"/> - <source>Quixote Template Files (*.ptl)</source> - <translation>Quixote Template soubory (*.ptl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="553"/> - <source>Ruby Files (*.rb)</source> - <translation>Ruby soubory (*.rb)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="556"/> - <source>IDL Files (*.idl)</source> - <translation>IDL soubory (*.idl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="383"/> - <source>C Files (*.h *.c)</source> - <translation>C soubory (*.h *.c)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="386"/> - <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> - <translation>C++ soubory (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="568"/> + <source>Quixote Template Files (*.ptl)</source> + <translation>Quixote Template soubory (*.ptl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="571"/> + <source>Ruby Files (*.rb)</source> + <translation>Ruby soubory (*.rb)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="574"/> + <source>IDL Files (*.idl)</source> + <translation>IDL soubory (*.idl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="393"/> + <source>C Files (*.h *.c)</source> + <translation>C soubory (*.h *.c)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="396"/> + <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> + <translation>C++ soubory (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="586"/> <source>C# Files (*.cs)</source> <translation>C# soubory (*.cs)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="392"/> + <location filename="../QScintilla/Lexers/__init__.py" line="402"/> <source>HTML Files (*.html *.htm *.asp *.shtml)</source> <translation>HTML soubory (*.html *.htm *.asp *.shtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="580"/> + <location filename="../QScintilla/Lexers/__init__.py" line="598"/> <source>CSS Files (*.css)</source> <translation>CSS soubory (*.css)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="583"/> + <location filename="../QScintilla/Lexers/__init__.py" line="601"/> <source>QSS Files (*.qss)</source> <translation>QSS soubory (*.qss)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="401"/> + <location filename="../QScintilla/Lexers/__init__.py" line="411"/> <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> <translation>PHP soubory (*.php *.php3 *.php4 *.php5 *.phtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="595"/> - <source>Qt Resource Files (*.qrc)</source> - <translation>Qt Resource soubory (*.qrc)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="410"/> - <source>D Files (*.d *.di)</source> - <translation>D soubory (*.d *.di)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="604"/> - <source>Java Files (*.java)</source> - <translation>Java soubory (*.java)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="607"/> - <source>JavaScript Files (*.js)</source> - <translation>JavaScript soubory (*.js)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="610"/> - <source>SQL Files (*.sql)</source> - <translation>SQL soubory (*.sql)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="613"/> - <source>Docbook Files (*.docbook)</source> - <translation>Docbook soubory (*.docbook)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="425"/> - <source>Perl Files (*.pl *.pm *.ph)</source> - <translation>Perl soubory (*.pl *.pm *.ph)</translation> + <source>Qt Resource Files (*.qrc)</source> + <translation>Qt Resource soubory (*.qrc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="420"/> + <source>D Files (*.d *.di)</source> + <translation>D soubory (*.d *.di)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="622"/> - <source>Lua Files (*.lua)</source> - <translation>Lua soubory (*.lua)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="431"/> - <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> - <translation>Tex soubory (*.tex *.sty *.aux *.toc *.idx)</translation> + <source>Java Files (*.java)</source> + <translation>Java soubory (*.java)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="625"/> + <source>JavaScript Files (*.js)</source> + <translation>JavaScript soubory (*.js)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="628"/> + <source>SQL Files (*.sql)</source> + <translation>SQL soubory (*.sql)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="631"/> + <source>Docbook Files (*.docbook)</source> + <translation>Docbook soubory (*.docbook)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="435"/> + <source>Perl Files (*.pl *.pm *.ph)</source> + <translation>Perl soubory (*.pl *.pm *.ph)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="640"/> + <source>Lua Files (*.lua)</source> + <translation>Lua soubory (*.lua)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="441"/> + <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> + <translation>Tex soubory (*.tex *.sty *.aux *.toc *.idx)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="643"/> <source>Shell Files (*.sh)</source> <translation>Shell soubory (*.sh)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="437"/> + <location filename="../QScintilla/Lexers/__init__.py" line="447"/> <source>Batch Files (*.bat *.cmd)</source> <translation>Batch soubory (*.bat *.cmd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="440"/> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> <source>Diff Files (*.diff *.patch)</source> <translation>Diff soubory (*.diff *.patch)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="443"/> - <source>Makefiles (*.mak)</source> - <translation>Makefiles (*.mak)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="446"/> - <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> - <translation>Properties soubory (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="649"/> - <source>Povray Files (*.pov)</source> - <translation>Povray soubory (*.pov)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="453"/> - <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> - <translation>CMake soubory (CMakeLists.txt *.cmake *.ctest)</translation> + <source>Makefiles (*.mak)</source> + <translation>Makefiles (*.mak)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="456"/> + <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> + <translation>Properties soubory (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="667"/> + <source>Povray Files (*.pov)</source> + <translation>Povray soubory (*.pov)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="463"/> + <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> + <translation>CMake soubory (CMakeLists.txt *.cmake *.ctest)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="466"/> <source>VHDL Files (*.vhd *.vhdl)</source> <translation>VHDL soubory (*.vhd *.vhdl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="718"/> + <location filename="../QScintilla/Lexers/__init__.py" line="744"/> <source>All Files (*)</source> <translation>Všechny soubory (*)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="135"/> + <location filename="../QScintilla/Lexers/__init__.py" line="139"/> <source>TCL</source> <translation>TCL</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="459"/> + <location filename="../QScintilla/Lexers/__init__.py" line="469"/> <source>TCL/Tk Files (*.tcl *.tk)</source> <translation>TCL/Tk soubory (*.tcl *.tk)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="559"/> - <source>C Files (*.c)</source> - <translation>C soubory (*.c)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="562"/> - <source>C++ Files (*.cpp)</source> - <translation>C++ soubory (*.cpp)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="565"/> - <source>C++/C Header Files (*.h)</source> - <translation>C++/C hlavičkové soubory (*.h)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="571"/> - <source>HTML Files (*.html)</source> - <translation>HTML soubory (*.html)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="574"/> - <source>PHP Files (*.php)</source> - <translation>PHP soubory (*.php)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="577"/> - <source>ASP Files (*.asp)</source> - <translation>ASP soubory (*.asp)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="586"/> - <source>XML Files (*.xml)</source> - <translation>XML soubory (*.xml)</translation> + <source>C Files (*.c)</source> + <translation>C soubory (*.c)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="580"/> + <source>C++ Files (*.cpp)</source> + <translation>C++ soubory (*.cpp)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="583"/> + <source>C++/C Header Files (*.h)</source> + <translation>C++/C hlavičkové soubory (*.h)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="589"/> - <source>XSL Files (*.xsl)</source> - <translation>XSL soubory (*.xsl)</translation> + <source>HTML Files (*.html)</source> + <translation>HTML soubory (*.html)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="592"/> + <source>PHP Files (*.php)</source> + <translation>PHP soubory (*.php)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="595"/> + <source>ASP Files (*.asp)</source> + <translation>ASP soubory (*.asp)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="604"/> + <source>XML Files (*.xml)</source> + <translation>XML soubory (*.xml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="607"/> + <source>XSL Files (*.xsl)</source> + <translation>XSL soubory (*.xsl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="610"/> <source>DTD Files (*.dtd)</source> <translation>DTD soubory (*.dtd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="598"/> - <source>D Files (*.d)</source> - <translation>D soubory (*.d)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="601"/> - <source>D Interface Files (*.di)</source> - <translation>D Interface soubory (*.di)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="616"/> - <source>Perl Files (*.pl)</source> - <translation>Perl soubory (*.pl)</translation> + <source>D Files (*.d)</source> + <translation>D soubory (*.d)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="619"/> - <source>Perl Module Files (*.pm)</source> - <translation>Perl Module soubory (*.pm)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="628"/> - <source>Batch Files (*.bat)</source> - <translation>Batch soubory (*.bat)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="631"/> - <source>TeX Files (*.tex)</source> - <translation>TeX soubory (*.tex)</translation> + <source>D Interface Files (*.di)</source> + <translation>D Interface soubory (*.di)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="634"/> - <source>TeX Template Files (*.sty)</source> - <translation>TeX Template soubory (*.sty)</translation> + <source>Perl Files (*.pl)</source> + <translation>Perl soubory (*.pl)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="637"/> - <source>Diff Files (*.diff)</source> - <translation>Diff soubory (*.diff)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="640"/> - <source>Make Files (*.mak)</source> - <translation>Make soubory (*.mak)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="643"/> - <source>Properties Files (*.ini)</source> - <translation>Properties soubory (*.ini)</translation> + <source>Perl Module Files (*.pm)</source> + <translation>Perl Module soubory (*.pm)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="646"/> - <source>Configuration Files (*.cfg)</source> - <translation>Konfigurační soubory (*.cfg)</translation> + <source>Batch Files (*.bat)</source> + <translation>Batch soubory (*.bat)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="649"/> + <source>TeX Files (*.tex)</source> + <translation>TeX soubory (*.tex)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="652"/> - <source>CMake Files (CMakeLists.txt)</source> - <translation>CMake soubory (CMakeLists.txt)</translation> + <source>TeX Template Files (*.sty)</source> + <translation>TeX Template soubory (*.sty)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="655"/> - <source>CMake Macro Files (*.cmake)</source> - <translation>CMake makro soubory (*.cmake)</translation> + <source>Diff Files (*.diff)</source> + <translation>Diff soubory (*.diff)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="658"/> - <source>VHDL Files (*.vhd)</source> - <translation>VHDL soubory (*.vhd)</translation> + <source>Make Files (*.mak)</source> + <translation>Make soubory (*.mak)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="661"/> - <source>TCL Files (*.tcl)</source> - <translation>TCL soubory (*.tcl)</translation> + <source>Properties Files (*.ini)</source> + <translation>Properties soubory (*.ini)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="664"/> + <source>Configuration Files (*.cfg)</source> + <translation>Konfigurační soubory (*.cfg)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="670"/> + <source>CMake Files (CMakeLists.txt)</source> + <translation>CMake soubory (CMakeLists.txt)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="673"/> + <source>CMake Macro Files (*.cmake)</source> + <translation>CMake makro soubory (*.cmake)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="676"/> + <source>VHDL Files (*.vhd)</source> + <translation>VHDL soubory (*.vhd)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="679"/> + <source>TCL Files (*.tcl)</source> + <translation>TCL soubory (*.tcl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="682"/> <source>Tk Files (*.tk)</source> <translation>Tk soubory (*.tk)</translation> </message> @@ -35364,175 +35718,195 @@ <translation></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="115"/> + <location filename="../QScintilla/Lexers/__init__.py" line="119"/> <source>Pascal</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="462"/> + <location filename="../QScintilla/Lexers/__init__.py" line="472"/> <source>Fortran Files (*.f90 *.f95 *.f2k)</source> <translation>Fortran soubory (*.f90 *.f95 *.f2k)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="465"/> + <location filename="../QScintilla/Lexers/__init__.py" line="475"/> <source>Fortran77 Files (*.f *.for)</source> <translation>Fortran77 soubory (*.f *.for)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="468"/> + <location filename="../QScintilla/Lexers/__init__.py" line="478"/> <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> <translation>Pascal soubory (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="667"/> - <source>Fortran Files (*.f95)</source> - <translation>Fortran soubory (*.f95)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="670"/> - <source>Fortran77 Files (*.f)</source> - <translation>Fortran77 soubory (*.f)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="673"/> - <source>Pascal Files (*.pas)</source> - <translation>Pascal soubory (*.pas)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="119"/> - <source>PostScript</source> - <translation></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="141"/> - <source>XML</source> - <translation></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="143"/> - <source>YAML</source> - <translation></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="404"/> - <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> - <translation>XML soubory (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="676"/> - <source>PostScript Files (*.ps)</source> - <translation>PostScript soubory (*.ps)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="474"/> - <source>YAML Files (*.yaml *.yml)</source> - <translation>YAML soubory (*.yaml *.yml)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="679"/> - <source>YAML Files (*.yml)</source> - <translation>YAML soubory (*.yml)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="171"/> - <source>Pygments</source> - <translation>Pygments</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="365"/> - <source>Python Files (*.py *.py2 *.py3)</source> - <translation>Python soubory (*.py *.py2 *.py3)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="368"/> - <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> - <translation>Python GUI soubory (*.pyw *.pyw2 *.pyw3)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="538"/> - <source>Python3 Files (*.py)</source> - <translation>Python3 soubory (*.py)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="544"/> - <source>Python3 GUI Files (*.pyw)</source> - <translation>Python3 GUI soubory (*.pyw)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="535"/> - <source>Python2 Files (*.py2)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="541"/> - <source>Python2 GUI Files (*.pyw2)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="125"/> - <source>Python2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="127"/> - <source>Python3</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="148"/> - <source>Matlab</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="148"/> - <source>Octave</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="480"/> - <source>Matlab Files (*.m *.m.matlab)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="685"/> - <source>Matlab Files (*.m)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="685"/> - <source>Octave Files (*.m.octave)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="480"/> - <source>Octave Files (*.m *.m.octave)</source> + <source>Fortran Files (*.f95)</source> + <translation>Fortran soubory (*.f95)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="688"/> + <source>Fortran77 Files (*.f)</source> + <translation>Fortran77 soubory (*.f)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="691"/> + <source>Pascal Files (*.pas)</source> + <translation>Pascal soubory (*.pas)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="123"/> + <source>PostScript</source> + <translation></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="145"/> + <source>XML</source> + <translation></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="147"/> + <source>YAML</source> + <translation></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="414"/> + <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> + <translation>XML soubory (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="694"/> + <source>PostScript Files (*.ps)</source> + <translation>PostScript soubory (*.ps)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="484"/> + <source>YAML Files (*.yaml *.yml)</source> + <translation>YAML soubory (*.yaml *.yml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="697"/> + <source>YAML Files (*.yml)</source> + <translation>YAML soubory (*.yml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="175"/> + <source>Pygments</source> + <translation>Pygments</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="375"/> + <source>Python Files (*.py *.py2 *.py3)</source> + <translation>Python soubory (*.py *.py2 *.py3)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="378"/> + <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> + <translation>Python GUI soubory (*.pyw *.pyw2 *.pyw3)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="556"/> + <source>Python3 Files (*.py)</source> + <translation>Python3 soubory (*.py)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="562"/> + <source>Python3 GUI Files (*.pyw)</source> + <translation>Python3 GUI soubory (*.pyw)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="553"/> + <source>Python2 Files (*.py2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="559"/> + <source>Python2 GUI Files (*.pyw2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="129"/> + <source>Python2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="131"/> + <source>Python3</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="115"/> + <source>Matlab</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="117"/> + <source>Octave</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="487"/> + <source>Matlab Files (*.m *.m.matlab)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="700"/> + <source>Matlab Files (*.m)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="703"/> + <source>Octave Files (*.m.octave)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="490"/> + <source>Octave Files (*.m *.m.octave)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="133"/> <source>QSS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="157"/> + <location filename="../QScintilla/Lexers/__init__.py" line="153"/> <source>Gettext</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="695"/> + <location filename="../QScintilla/Lexers/__init__.py" line="709"/> <source>Gettext Files (*.po)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="162"/> + <location filename="../QScintilla/Lexers/__init__.py" line="158"/> <source>CoffeeScript</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="702"/> + <location filename="../QScintilla/Lexers/__init__.py" line="716"/> <source>CoffeeScript Files (*.coffee)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="163"/> + <source>JSON</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="723"/> + <source>JSON Files (*.json)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="166"/> + <source>Markdown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="728"/> + <source>Markdown Files (*.md)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>LfConvertDataDialog</name> @@ -35745,6 +36119,19 @@ </message> </context> <context> + <name>MarkdownProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/MarkdownProvider.py" line="383"/> + <source>Create List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/MarkdownProvider.py" line="383"/> + <source>Enter desired number of list elements:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>MasterPasswordEntryDialog</name> <message> <location filename="../Preferences/ConfigurationPages/MasterPasswordEntryDialog.ui" line="14"/> @@ -35820,12 +36207,12 @@ <context> <name>McCabeChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="423"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="426"/> <source>'{0}' is too complex ({1})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="425"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="428"/> <source>{0}: {1}</source> <translation type="unfinished"></translation> </message> @@ -35853,124 +36240,119 @@ <translation>Zadejte číslo log zpráv, které mají být zobrazeny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="155"/> <source>Commit</source> <translation>Zapsat měny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="161"/> <source>No. of commit messages to remember:</source> <translation>Počet zpráv zapsaných změn k zapamatování:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="168"/> <source>Enter the number of commit messages to remember</source> <translation>Zadejte počet zpráv zapsaných změn k zapamatování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="236"/> <source>Incoming / Outgoing</source> - <translation>Příchozí / Odchozí</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="222"/> - <source>Select to show the incoming and outgoing log in a log browser dialog</source> - <translation>Vybrat pro zobrazení příchozích a odchozích logů v prohlížeči logů</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="225"/> + <translation type="obsolete">Příchozí / Odchozí</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="242"/> + <source>Select to update the working directory to new tip</source> + <translation>Zvolte, zda chcete aktualizovat pracovní adresář na nový tip</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="245"/> <source>Use Log Browser for incoming / outgoing log</source> - <translation>Použít Log prohlížeč pro příchozí / odchozí logy</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="235"/> + <translation type="obsolete">Použít Log prohlížeč pro příchozí / odchozí logy</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="236"/> <source>Pull</source> <translation>Stáhnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="241"/> - <source>Select to update the working directory to new tip</source> - <translation>Zvolte, zda chcete aktualizovat pracovní adresář na nový tip</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="245"/> <source>Update after pulling</source> <translation>Aktualizovat po stažení</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="334"/> <source>Edit the Mercurial configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="337"/> <source>Edit configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="311"/> <source>Cleanup</source> <translation type="unfinished">Vyčistit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="317"/> <source>Pattern:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="324"/> <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="252"/> <source>Select to prefer unbundle over pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="255"/> <source><b>Prefer Unbundle</b> <p>If this option is selected, it will be checked, if a Mercurial changegroups file from a previous "Show Incoming" request exists. In this case it will be applied and deleted. Otherwise a pull request will be sent.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="259"/> <source>Prefer Unbundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="292"/> <source>Revert</source> <translation type="unfinished">Vrátit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="298"/> <source>Select to create a backup file (.orig) before reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="301"/> <source>Create Backup Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="269"/> <source>Merge</source> <translation type="unfinished">Sloučit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="275"/> <source>Select to enforce usage of the Mercural internal merge tool</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="278"/> <source><b>Internal Merge Tool</b> <p>Select to enforce usage of the Mercural internal merge tool,which leaves conflict markers in the file in case of conflicting changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="282"/> <source>Use internal merge with conflict markers</source> <translation type="unfinished"></translation> </message> @@ -36005,15 +36387,25 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="197"/> <source>No. of commit authors to remember:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="204"/> <source>Enter the number of commit authors to remember</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="132"/> + <source>No. of message characters shown in list:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="139"/> + <source>Enter the number of characters of the commit message to be shown in the list</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -36972,107 +37364,107 @@ <context> <name>MiscellaneousChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="429"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="432"/> <source>coding magic comment not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="432"/> - <source>unknown encoding ({0}) found in coding magic comment</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="435"/> - <source>copyright notice not present</source> + <source>unknown encoding ({0}) found in coding magic comment</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="438"/> - <source>copyright notice contains invalid author</source> + <source>copyright notice not present</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="441"/> - <source>blind except: statement</source> + <source>copyright notice contains invalid author</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="444"/> - <source>found {0} formatter</source> + <source>blind except: statement</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="447"/> - <source>format string does contain unindexed parameters</source> + <source>found {0} formatter</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="450"/> - <source>docstring does contain unindexed parameters</source> + <source>format string does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="453"/> - <source>other string does contain unindexed parameters</source> + <source>docstring does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="456"/> - <source>format call uses too large index ({0})</source> + <source>other string does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="459"/> - <source>format call uses missing keyword ({0})</source> + <source>format call uses too large index ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="462"/> - <source>format call uses keyword arguments but no named entries</source> + <source>format call uses missing keyword ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="465"/> - <source>format call uses variable arguments but no numbered entries</source> + <source>format call uses keyword arguments but no named entries</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="468"/> - <source>format call uses implicit and explicit indexes together</source> + <source>format call uses variable arguments but no numbered entries</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="471"/> - <source>format call provides unused index ({0})</source> + <source>format call uses implicit and explicit indexes together</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="474"/> - <source>format call provides unused keyword ({0})</source> + <source>format call provides unused index ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="477"/> - <source>expected these __future__ imports: {0}; but only got: {1}</source> + <source>format call provides unused keyword ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="480"/> - <source>expected these __future__ imports: {0}; but got none</source> + <source>expected these __future__ imports: {0}; but only got: {1}</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="483"/> - <source>print statement found</source> + <source>expected these __future__ imports: {0}; but got none</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="486"/> - <source>one element tuple found</source> + <source>print statement found</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="489"/> + <source>one element tuple found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="492"/> <source>{0}: {1}</source> <translation type="unfinished"></translation> </message> @@ -37465,72 +37857,72 @@ <context> <name>NamingStyleChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="378"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> <source>class names should use CapWords convention</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> - <source>function name should be lowercase</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="384"/> - <source>argument name should be lowercase</source> + <source>function name should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="387"/> - <source>first argument of a class method should be named 'cls'</source> + <source>argument name should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="390"/> - <source>first argument of a method should be named 'self'</source> + <source>first argument of a class method should be named 'cls'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="393"/> + <source>first argument of a method should be named 'self'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="396"/> <source>first argument of a static method should not be named 'self' or 'cls</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="397"/> - <source>module names should be lowercase</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="400"/> - <source>package names should be lowercase</source> + <source>module names should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="403"/> - <source>constant imported as non constant</source> + <source>package names should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="406"/> - <source>lowercase imported as non lowercase</source> + <source>constant imported as non constant</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="409"/> - <source>camelcase imported as lowercase</source> + <source>lowercase imported as non lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="412"/> - <source>camelcase imported as constant</source> + <source>camelcase imported as lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="415"/> - <source>variable in function should be lowercase</source> + <source>camelcase imported as constant</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="418"/> + <source>variable in function should be lowercase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="421"/> <source>names 'l', 'O' and 'I' should be avoided</source> <translation type="unfinished"></translation> </message> @@ -39934,27 +40326,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1525"/> + <location filename="../Preferences/__init__.py" line="1530"/> <source>Export Preferences</source> <translation>Předvolby exportu</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1553"/> + <location filename="../Preferences/__init__.py" line="1558"/> <source>Import Preferences</source> <translation>Předvolby importu</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1553"/> + <location filename="../Preferences/__init__.py" line="1558"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1655"/> + <location filename="../Preferences/__init__.py" line="1660"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1655"/> + <location filename="../Preferences/__init__.py" line="1660"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -39980,7 +40372,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="572"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="565"/> <source><p>ReStructuredText preview requires the <b>python-docutils</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pypi.python.org/pypi/docutils">this page.</a></p></source> <translation type="unfinished"></translation> </message> @@ -39990,8 +40382,8 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="597"/> - <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> + <location filename="../UI/Previewers/PreviewerHTML.py" line="590"/> + <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> <translation type="unfinished"></translation> </message> </context> @@ -40018,17 +40410,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="177"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="179"/> <source><p>No preview available for this type of file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="225"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="230"/> <source>Preview - {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="227"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="232"/> <source>Preview</source> <translation type="unfinished"></translation> </message> @@ -44640,521 +45032,506 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/> - <source>Show log</source> - <translation type="unfinished">Zobrazit log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/> - <source>Show &log</source> - <translation type="unfinished">Zobrazit &log</translation> + <source>Show log browser</source> + <translation type="unfinished">Zobrazit log prohlížeč</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> - <source>Show the log of the local project</source> - <translation type="unfinished">Zobrazit log lokálního projektu</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation type="unfinished">Zobrazit dialog pro procházení logů lokálního projektu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="107"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation type="unfinished"><b>Zobrazit log</b><p>Zobrazí log lokálního projektu.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="114"/> - <source>Show log browser</source> - <translation type="unfinished">Zobrazit log prohlížeč</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="119"/> - <source>Show a dialog to browse the log of the local project</source> - <translation type="unfinished">Zobrazit dialog pro procházení logů lokálního projektu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/> + <translation type="obsolete"><b>Zobrazit log</b><p>Zobrazí log lokálního projektu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="107"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"><b>Zobrazit log prohlížeč</b><p>Zobrazí se dialogové okno pro procházení logů lokálního projektu. Jako první je zobrazen limit maximálního přenosu. Více záznamů může být zobrazeno později.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/> <source>Show &difference</source> <translation type="unfinished">Zobrazit o&dlišnosti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished">Zobrazí odlišnosti mezi lokálním projektem a repozitářem</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="132"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="137"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished">Zobrazí odlišnosti mezi revizemi projektu v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="140"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/> <source>Show differences (URLs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="153"/> <source>Show the difference of the project between two repository URLs</source> <translation type="unfinished">Zobrazit odlišnosti v projektu mezi dvěma repozitáři na URL</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="156"/> <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/> + <source>Show status</source> + <translation type="unfinished">Zobrazit status</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/> + <source>Show &status</source> + <translation type="unfinished">Zobrazit &status</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> + <source>Show the status of the local project</source> + <translation type="unfinished">Zobrazit status lokálního projektu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="172"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished"><b>Zobrazit status</b><p>Zobrazí status lokálního projektu.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> - <source>Show status</source> - <translation type="unfinished">Zobrazit status</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> - <source>Show &status</source> - <translation type="unfinished">Zobrazit &status</translation> + <source>Show change lists</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/> - <source>Show the status of the local project</source> - <translation type="unfinished">Zobrazit status lokálního projektu</translation> + <source>Show the change lists and associated files of the local project</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="187"/> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation type="unfinished"><b>Zobrazit status</b><p>Zobrazí status lokálního projektu.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> - <source>Show change lists</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="199"/> - <source>Show the change lists and associated files of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="202"/> <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> <source>Show repository info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="215"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="200"/> <source>Show some repository related information for the local project</source> <translation type="unfinished">Zobrazí nějaké infomace související s repozitářem pro lokální projekt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="203"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation type="unfinished"><b>Zobrazit info repozitáře</b><p>Zobrazí nějaké infomace související s repozitářem pro lokální projekt.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source>Tag in repository</source> + <translation type="unfinished">Vytvořit tag v repozitáři</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source>&Tag in repository...</source> + <translation type="unfinished">Vytvořit &tag v repozitáři...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="216"/> + <source>Tag the local project in the repository</source> + <translation type="unfinished">Vytvořit Tag - značku z lokálního projektu do repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"><b>Vytvořit tag v repozitáři</b><p>Z lokálního projektu vytvoří značku - tag v repozitáři.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> - <source>Tag in repository</source> - <translation type="unfinished">Vytvořit tag v repozitáři</translation> + <source>Export from repository</source> + <translation type="unfinished">Exportovat z repozitáře</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> - <source>&Tag in repository...</source> - <translation type="unfinished">Vytvořit &tag v repozitáři...</translation> + <source>&Export from repository...</source> + <translation type="unfinished">&Exportovat z repozitáře...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="231"/> - <source>Tag the local project in the repository</source> - <translation type="unfinished">Vytvořit Tag - značku z lokálního projektu do repozitáře</translation> + <source>Export a project from the repository</source> + <translation type="unfinished">Export projekt z repozitáře</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished"><b>Vytvořit tag v repozitáři</b><p>Z lokálního projektu vytvoří značku - tag v repozitáři.</p></translation> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation type="unfinished"><b>Exportovat z repozitáře</b><p>Exportuje projekt z repozitáře.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> - <source>Export from repository</source> - <translation type="unfinished">Exportovat z repozitáře</translation> + <source>Command options</source> + <translation type="unfinished">Parametry příkazu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> - <source>&Export from repository...</source> - <translation type="unfinished">&Exportovat z repozitáře...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="246"/> - <source>Export a project from the repository</source> - <translation type="unfinished">Export projekt z repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation type="unfinished"><b>Exportovat z repozitáře</b><p>Exportuje projekt z repozitáře.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/> - <source>Command options</source> - <translation type="unfinished">Parametry příkazu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/> <source>Command &options...</source> <translation type="unfinished">&Parametry příkazu...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Show the VCS command options</source> <translation type="unfinished">Zobrazit parametry VCS příkazu</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation type="unfinished"><b>Parametry příkazu...</b><p>Zobrazí se dialog s editací parametrů VCS příkazu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/> + <source>Revert changes</source> + <translation type="unfinished">Vrátit změny</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/> + <source>Re&vert changes</source> + <translation type="unfinished">&Vrátit změny</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <source>Revert all changes made to the local project</source> + <translation type="unfinished">Vrátit všechny změny, které byly provedeny v lokálním projektu</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation type="unfinished"><b>Parametry příkazu...</b><p>Zobrazí se dialog s editací parametrů VCS příkazu.</p></translation> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation type="unfinished"><b>Vrátit změny</b><p>Vrátí se všechny změny, které byly provedeny v lokálním projektu.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/> - <source>Revert changes</source> - <translation type="unfinished">Vrátit změny</translation> + <source>Merge</source> + <translation type="unfinished">Sloučit</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/> - <source>Re&vert changes</source> - <translation type="unfinished">&Vrátit změny</translation> + <source>Mer&ge changes...</source> + <translation type="unfinished">&Sloučit změny...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> - <source>Revert all changes made to the local project</source> - <translation type="unfinished">Vrátit všechny změny, které byly provedeny v lokálním projektu</translation> + <source>Merge changes of a tag/revision into the local project</source> + <translation type="unfinished">Sloučit změny tagu/revize do lokálního projektu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation type="unfinished"><b>Vrátit změny</b><p>Vrátí se všechny změny, které byly provedeny v lokálním projektu.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/> - <source>Merge</source> - <translation type="unfinished">Sloučit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/> - <source>Mer&ge changes...</source> - <translation type="unfinished">&Sloučit změny...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="289"/> - <source>Merge changes of a tag/revision into the local project</source> - <translation type="unfinished">Sloučit změny tagu/revize do lokálního projektu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation type="unfinished"><b>Sloučit</b><p>Sloučí se změny tagu/revize do lokálního projektu.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/> + <source>Switch</source> + <translation type="unfinished">Přepnout</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/> + <source>S&witch...</source> + <translation type="unfinished">&Přepnout...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <source>Switch the local copy to another tag/branch</source> + <translation type="unfinished">Přepnout lokální kopii do jiného tagu/větve</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> + <translation type="unfinished"><b>Přepnout</b><p>Přepne lokální kopii do jiného tagu/větve.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>Switch</source> - <translation type="unfinished">Přepnout</translation> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>S&witch...</source> - <translation type="unfinished">&Přepnout...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> - <source>Switch the local copy to another tag/branch</source> - <translation type="unfinished">Přepnout lokální kopii do jiného tagu/větve</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> - <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> - <translation type="unfinished"><b>Přepnout</b><p>Přepne lokální kopii do jiného tagu/větve.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> - <source>Conflicts resolved</source> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="304"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="307"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> - <source>Con&flicts resolved</source> + <source>Cleanup</source> + <translation type="unfinished">Vyčistit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> + <source>Cleanu&p</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished"></translation> + <source>Cleanup the local project</source> + <translation type="unfinished">Vyčistit lokální projekt</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="322"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/> - <source>Cleanup</source> - <translation type="unfinished">Vyčistit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/> - <source>Cleanu&p</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> - <source>Cleanup the local project</source> - <translation type="unfinished">Vyčistit lokální projekt</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="337"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation type="unfinished"><b>Vyčistit</b><p>Provede úklid lokálního projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>Execute command</source> <translation type="unfinished">Provést příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>E&xecute command...</source> <translation type="unfinished">P&rovést příkaz...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="333"/> <source>Execute an arbitrary VCS command</source> <translation type="unfinished">Provede se libovolný VCS příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="336"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation type="unfinished"><b>Provést příkaz</b><p>Otevře se dialogové okno pro zadání libovolného příkazu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/> <source>List tags</source> <translation type="unfinished">Seznam tagů</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/> <source>List tags...</source> <translation type="unfinished">Seznam tagů...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> <source>List tags of the project</source> <translation type="unfinished">Seznam tagů projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="350"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"><b>Seznam tagů</b><p>Zobrazí seznam tagů projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches</source> <translation type="unfinished">Seznam větví</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches...</source> <translation type="unfinished">Seznam větví...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="361"/> <source>List branches of the project</source> <translation type="unfinished">Seznam větví projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="364"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation type="unfinished"><b>Seznam větví</b><p>Zobrazí seznam větví projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source>List repository contents</source> <translation type="unfinished">Seznam obsahu repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source>List repository contents...</source> <translation type="unfinished">Seznam obsahu repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="375"/> <source>Lists the contents of the repository</source> <translation type="unfinished">Vypisuje seznam obsahu repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation type="unfinished"><b>Seznam obsahu repozitáře</b><p>Zobrazuje seznam obsahu repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/> <source>Set Property</source> <translation type="unfinished">Nastavit vlastnosti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/> <source>Set Property...</source> <translation type="unfinished">Nastavit vlastnosti...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="389"/> <source>Set a property for the project files</source> <translation type="unfinished">Nastaví vlastnosti souborů projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="392"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation type="unfinished"><b>Nastavit vlastnosti</b><p>Nastavuje vlastnosti souborů projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source>List Properties</source> <translation type="unfinished">Seznam vlastností</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source>List Properties...</source> <translation type="unfinished">Seznam vlastností...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="403"/> <source>List properties of the project files</source> <translation type="unfinished">Seznam vlastností souborů projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation type="unfinished"><b>Seznam vlastností</b><p>Vypisuje seznam vlastností souborů projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/> <source>Delete Property</source> <translation type="unfinished">Smazat vlastnost</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/> <source>Delete Property...</source> <translation type="unfinished">Smazat vlastnost...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> + <source>Delete a property for the project files</source> + <translation type="unfinished">Smaže vlastnost pro soubory projektu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="420"/> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation type="unfinished"><b>Smazat vlastnost</b><p>Smaže vlastnost pro soubory projektu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/> + <source>Relocate</source> + <translation type="unfinished">Přemístit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/> + <source>Relocate...</source> + <translation type="unfinished">Přemístit...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> - <source>Delete a property for the project files</source> - <translation type="unfinished">Smaže vlastnost pro soubory projektu</translation> + <source>Relocate the working copy to a new repository URL</source> + <translation type="unfinished">Přemístit pracovní kopii do nového URL repozitáře</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation type="unfinished"><b>Smazat vlastnost</b><p>Smaže vlastnost pro soubory projektu.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/> - <source>Relocate</source> - <translation type="unfinished">Přemístit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/> - <source>Relocate...</source> - <translation type="unfinished">Přemístit...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> - <source>Relocate the working copy to a new repository URL</source> - <translation type="unfinished">Přemístit pracovní kopii do nového URL repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation type="unfinished"><b>Přemístit</b><p>Pracovní kopie se přemístí na nové URL repozitáře.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/> + <source>Repository Browser</source> + <translation type="unfinished">Prohlížeč repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/> + <source>Repository Browser...</source> + <translation type="unfinished">Prohlížeč repozitáře...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> + <source>Show the Repository Browser dialog</source> + <translation type="unfinished">Zobrazit dialog prohlížeče repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation type="unfinished"><b>Prohlížeč repozitáře</b><p>Zobrazí se dialogové okno prohlížeče repozitáře.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> - <source>Repository Browser</source> - <translation type="unfinished">Prohlížeč repozitáře</translation> + <source>Configure</source> + <translation type="unfinished">Konfigurovat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> - <source>Repository Browser...</source> - <translation type="unfinished">Prohlížeč repozitáře...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="463"/> - <source>Show the Repository Browser dialog</source> - <translation type="unfinished">Zobrazit dialog prohlížeče repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="466"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation type="unfinished"><b>Prohlížeč repozitáře</b><p>Zobrazí se dialogové okno prohlížeče repozitáře.</p></translation> + <source>Configure...</source> + <translation type="unfinished">Konfigurovat...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="462"/> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation type="unfinished">Zobrazit konfigurační dialog s vybranou Subversion stranou</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="465"/> + <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> + <translation type="unfinished"><b>Konfigurovat</b><p>Zobrazit konfigurační dialog s vybranou Subversion stranou.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/> - <source>Configure</source> - <translation type="unfinished">Konfigurovat</translation> + <source>Upgrade</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/> - <source>Configure...</source> - <translation type="unfinished">Konfigurovat...</translation> + <source>Upgrade...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="477"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation type="unfinished">Zobrazit konfigurační dialog s vybranou Subversion stranou</translation> + <source>Upgrade the working copy to the current format</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="480"/> - <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> - <translation type="unfinished"><b>Konfigurovat</b><p>Zobrazit konfigurační dialog s vybranou Subversion stranou.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/> - <source>Upgrade</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/> - <source>Upgrade...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="492"/> - <source>Upgrade the working copy to the current format</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="495"/> <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="559"/> <source>Subversion (pysvn)</source> <translation type="unfinished">Subversion (pysvn)</translation> </message> @@ -48202,12 +48579,12 @@ <translation>Přidat...</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="58"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="68"/> <source>Remove</source> <translation>Odebrat</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="117"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="132"/> <source>Add Documentation</source> <translation>Přidat dokumentaci</translation> </message> @@ -48217,7 +48594,7 @@ <translation>Qt komprimované soubory s nápovqdou (*.qch)</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="152"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="167"/> <source>Remove Documentation</source> <translation>Odebrat dokumentaci</translation> </message> @@ -48227,40 +48604,50 @@ <translation>Stisknout pro výběr dokumentů QtNápovědy, které se přidají do databáze</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="55"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="65"/> <source>Press to remove the selected documents from the database</source> <translation>Stisknout pro odebrání vybraných dokumentů z databáze</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="137"/> - <source>Do you really want to remove the selected documentation sets from the database?</source> - <translation>Opravdu chcete odebrat vybrané dokumenty z databáze?</translation> - </message> - <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="107"/> - <source>The file <b>{0}</b> is not a valid Qt Help File.</source> - <translation>Soubor <b>{0}</b> není platný soubor Qt Nápovědy.</translation> - </message> - <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="117"/> - <source>The namespace <b>{0}</b> is already registered.</source> - <translation>Jmenný prostor <b>{0}</b> je již registrován.</translation> - </message> - <message> <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="152"/> + <source>Do you really want to remove the selected documentation sets from the database?</source> + <translation>Opravdu chcete odebrat vybrané dokumenty z databáze?</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="122"/> + <source>The file <b>{0}</b> is not a valid Qt Help File.</source> + <translation>Soubor <b>{0}</b> není platný soubor Qt Nápovědy.</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="132"/> + <source>The namespace <b>{0}</b> is already registered.</source> + <translation>Jmenný prostor <b>{0}</b> je již registrován.</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="167"/> <source>Some documents currently opened reference the documentation you are attempting to remove. Removing the documentation will close those documents. Remove anyway?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="78"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="55"/> <source>Press to select QtHelp documents provided by a plug-in to add to the database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="81"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="58"/> <source>Add from Plug-ins...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="85"/> + <source>Select to manage the plug-in provided documentation sets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="88"/> + <source>Manage Plug-ins...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QtHelpDocumentationSelectionDialog</name> @@ -48274,6 +48661,61 @@ <source>Select the documentation files to be installed:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="144"/> + <source>Delete Documentation Sets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="91"/> + <source>Shall the selected documentation sets really be deleted?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="107"/> + <source><p>The documentation set <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="126"/> + <source>Shall the selected documentation set categories really be deleted?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="144"/> + <source>Shall all documentation sets really be deleted?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="56"/> + <source>Press to delete the selected documentation sets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="59"/> + <source>Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="66"/> + <source>Press to delete the selected category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="69"/> + <source>Delete Categories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="76"/> + <source>Press to delete all entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="79"/> + <source>Delete All</source> + <translation type="unfinished">Smazat vše</translation> + </message> </context> <context> <name>QtHelpFiltersDialog</name> @@ -49546,6 +49988,19 @@ </message> </context> <context> + <name>RestructuredTextProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/RestructuredTextProvider.py" line="411"/> + <source>Create List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/RestructuredTextProvider.py" line="411"/> + <source>Enter desired number of list elements:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>SafariImporter</name> <message> <location filename="../WebBrowser/Bookmarks/BookmarksImporters/SafariImporter.py" line="44"/> @@ -52720,107 +53175,102 @@ <translation>Odebrat soubory/adresáře ze Subversion repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/> <source>Subversion Error</source> <translation>Subversion chyba</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="951"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>Z pracovní kopie nelze získat URL repozitáře projektu. Operace tagování bude zrušena</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="998"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="978"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>URL repozitáře projektu má neplatný formát. Operace tagování bude zrušena</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1056"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1093"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1073"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>Z pracovní kopie nelze získat URL repozitáře projektu. Operace přepínání bude zrušena</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>URL repozitáře projektu má neplatný formát. Operace přepínání bude zrušena</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1512"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1492"/> <source>Subversion command</source> <translation>Subversion příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1684"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1664"/> <source>Resolving conficts</source> <translation>Řešení konfliktů</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1779"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1759"/> <source>Subversion Set Property</source> <translation>Nastavit Subversion vlastnost</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1781"/> + <source>You have to supply a property name. Aborting.</source> + <translation>Musíte doplnit jméno vlastnosti. Zrušeno.</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1801"/> - <source>You have to supply a property name. Aborting.</source> - <translation>Musíte doplnit jméno vlastnosti. Zrušeno.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1821"/> <source>Subversion Delete Property</source> <translation>Smazat Subversion vlastnost</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1791"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1771"/> <source>Enter property name</source> <translation>Zadejte jméno vlastnosti</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> - <source>Subversion Log</source> - <translation></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> <source>Select number of entries to show.</source> - <translation>Vyberte počet položek, které se mají zobrazit.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2100"/> + <translation type="obsolete">Vyberte počet položek, které se mají zobrazit.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2080"/> <source>Locking in the Subversion repository</source> <translation>Zamknout v Subversion repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2108"/> <source>Unlocking in the Subversion repository</source> <translation>Odemknout v Subversion repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1923"/> <source>Property set.</source> <translation>Vlastnost nastavena.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1997"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1976"/> <source>Property deleted.</source> <translation>Vlastnost smazána.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/> <source>Subversion Lock</source> <translation>Subversion zámek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/> <source>Enter lock comment</source> <translation>Zadejte komentář zámku</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2153"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2133"/> <source>Relocating</source> <translation></translation> </message> @@ -52975,7 +53425,7 @@ <translation>mimo verzi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1984"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1964"/> <source>The svn process did not finish within 30s.</source> <translation>Proces svn neskončil do 30s.</translation> </message> @@ -52985,27 +53435,27 @@ <translation>Nelze spustit svn proces.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/> <source>Repository Browser</source> <translation>Prohlížeč repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/> <source>Enter the repository URL.</source> <translation>Zadejte URL repozitáře.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2221"/> <source>Remove from changelist</source> <translation>Odebrat ze seznamu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/> <source>Add to changelist</source> <translation>Přidat do seznamu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/> <source>Enter name of the changelist:</source> <translation>Zadejte název seznamu změn:</translation> </message> @@ -53035,27 +53485,27 @@ <translation>Přesun {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1033"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1013"/> <source>Tagging {0} in the Subversion repository</source> <translation>Tagování {0} v Subversion repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1151"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1131"/> <source>Switching to {0}</source> <translation>Přepínání do {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1196"/> <source>Merging {0}</source> <translation>Sloučení {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1482"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1462"/> <source>Cleaning up {0}</source> <translation>Vyčištění {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1695"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> @@ -53071,7 +53521,7 @@ <translation>Zapsaná revize {0}.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1255"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1234"/> <source>Revision {0}. </source> <translation>Revize {0}.</translation> @@ -53087,37 +53537,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/> <source>Revert changes</source> <translation type="unfinished">Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1042"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1987"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1967"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/> <source>Subversion Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> nelze přečíst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2305"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2285"/> <source>Upgrade</source> <translation type="unfinished"></translation> </message> @@ -53993,12 +54443,12 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="661"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="658"/> <source>Author</source> <translation>Autor</translation> </message> @@ -54008,7 +54458,7 @@ <translation>Datum</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="165"/> <source>Message</source> <translation>Zpráva</translation> </message> @@ -54048,97 +54498,97 @@ <translation>Zadejte max. počet, ke stažení</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="261"/> <source>Press to generate a diff to the previous revision</source> <translation>Stisknout pro generování diffu s předchozí revizí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="264"/> <source>&Diff to Previous</source> <translation>&Diff s předchozím</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="271"/> <source>Press to compare two revisions</source> <translation>Stisknout pro porovnání dvou revizí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> <source>&Compare Revisions</source> <translation>&Porovnat revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="89"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="93"/> <source>Added</source> <translation>Přidáno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="90"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="94"/> <source>Deleted</source> <translation>Smazáno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="91"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="95"/> <source>Modified</source> <translation>Změněno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="504"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="527"/> <source>Subversion Error</source> <translation>Subversion chyba</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="312"/> <source>Errors</source> <translation>Chyby</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="318"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> <translation><b>Subversion log chyb</b><p>Zobrazí možné chyby z příkazu svn log.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="334"/> <source>Input</source> <translation>Vstup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="336"/> - <source>Press to send the input to the subversion process</source> - <translation>Stisknout pro odeslání vstupu do procesu subversion</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/> - <source>&Send</source> - <translation>Ode&slat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/> - <source>Alt+S</source> - <translation></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="349"/> - <source>Enter data to be sent to the subversion process</source> - <translation>Zadejte data, která mají být do procesu subversion odeslána</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> - <source>Select to switch the input field to password mode</source> - <translation>Vybrat pro přepnutí vstupního pole do módu hesla</translation> + <source>Press to send the input to the subversion process</source> + <translation>Stisknout pro odeslání vstupu do procesu subversion</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> - <source>&Password Mode</source> - <translation>Mód ve&psání hesla</translation> + <source>&Send</source> + <translation>Ode&slat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> + <source>Alt+S</source> + <translation></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="369"/> + <source>Enter data to be sent to the subversion process</source> + <translation>Zadejte data, která mají být do procesu subversion odeslána</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="376"/> + <source>Select to switch the input field to password mode</source> + <translation>Vybrat pro přepnutí vstupního pole do módu hesla</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="379"/> + <source>&Password Mode</source> + <translation>Mód ve&psání hesla</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="382"/> <source>Alt+P</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="313"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> @@ -54183,161 +54633,141 @@ <translation>Zatavit kopírování/přesun</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="313"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="96"/> <source>Replaced</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="294"/> <source>Select to show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="297"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnLogDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="14"/> - <source>Subversion Log</source> - <translation></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="26"/> - <source>Log</source> - <translation></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="32"/> <source><b>Subversion Log</b><p>This shows the output of the svn log command. By clicking on the links you may show the difference between versions.</p></source> - <translation><b>Subversion Log</b><p>Zobrazuje výstup z subversion log příkazu. Kliknutím na odkazy můžete zobrazit rozdíly mezi verzemi.</p></translation> + <translation type="obsolete"><b>Subversion Log</b><p>Zobrazuje výstup z subversion log příkazu. Kliknutím na odkazy můžete zobrazit rozdíly mezi verzemi.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="58"/> <source>Errors</source> - <translation>Chyby</translation> + <translation type="obsolete">Chyby</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="64"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> - <translation><b>Subversion log chyba</b><p>Zobrazí možné chyby z příkazu svn log.</p></translation> + <translation type="obsolete"><b>Subversion log chyba</b><p>Zobrazí možné chyby z příkazu svn log.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="80"/> <source>Input</source> - <translation>Vstup</translation> + <translation type="obsolete">Vstup</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="102"/> <source>Press to send the input to the subversion process</source> - <translation>Stisknout pro odeslání vstupu do procesu subversion</translation> + <translation type="obsolete">Stisknout pro odeslání vstupu do procesu subversion</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="105"/> <source>&Send</source> - <translation>Ode&slat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="108"/> - <source>Alt+S</source> - <translation></translation> + <translation type="obsolete">Ode&slat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="115"/> <source>Enter data to be sent to the subversion process</source> - <translation>Zadejte data, která mají být do procesu subversion odeslána</translation> + <translation type="obsolete">Zadejte data, která mají být do procesu subversion odeslána</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="122"/> <source>Select to switch the input field to password mode</source> - <translation>Výběr přepnutí vstupního pole na mód zadání hesla</translation> + <translation type="obsolete">Výběr přepnutí vstupního pole na mód zadání hesla</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="125"/> <source>&Password Mode</source> - <translation>Mód ve&psání hesla</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="128"/> - <source>Alt+P</source> - <translation></translation> + <translation type="obsolete">Mód ve&psání hesla</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="55"/> <source><b>Processing your request, please wait...</b></source> - <translation><p>Zpracovávám váš požadavek, prosím čekejte...</p></translation> + <translation type="obsolete"><p>Zpracovávám váš požadavek, prosím čekejte...</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="81"/> <source>Added</source> - <translation>Přidáno</translation> + <translation type="obsolete">Přidáno</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="82"/> <source>Deleted</source> - <translation>Smazáno</translation> + <translation type="obsolete">Smazáno</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="83"/> <source>Modified</source> - <translation>Změněno</translation> + <translation type="obsolete">Změněno</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="87"/> <source>revision</source> - <translation>revize</translation> + <translation type="obsolete">revize</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> <source>Process Generation Error</source> - <translation>Chyba v procesu generování</translation> + <translation type="obsolete">Chyba v procesu generování</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> + <translation type="obsolete">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="193"/> <source>diff to {0}</source> - <translation>diff na {0}</translation> + <translation type="obsolete">diff na {0}</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="202"/> <source><i>author: {0}</i><br /> </source> - <translation><i>Autor: {0}</i><br /> + <translation type="obsolete"><i>Autor: {0}</i><br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="205"/> <source><i>date: {0}</i><br /> </source> - <translation><i>datum: {0}</i><br /> + <translation type="obsolete"><i>datum: {0}</i><br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="191"/> <source> (copied from {0}, revision {1})</source> - <translation> (zkopírováno z {0}, revize {1})</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="42"/> - <source>Select to show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="45"/> - <source>Show differences side-by-side</source> - <translation type="unfinished"></translation> + <translation type="obsolete"> (zkopírováno z {0}, revize {1})</translation> </message> </context> <context> @@ -54646,177 +55076,177 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="634"/> <source>Version Control</source> <translation>Kontrola verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="654"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="646"/> <source>Update from repository</source> <translation>Obnovit z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="658"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="650"/> <source>Commit changes to repository...</source> <translation>Commitovat změny do repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="656"/> <source>Add to repository</source> <translation>Přidat do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="385"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="381"/> <source>Add tree to repository</source> <translation>Přidat stromovou strukturu do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="660"/> <source>Remove from repository (and disk)</source> <translation>Odebrat z repozitáře (a z disku)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="566"/> <source>Show log</source> - <translation>Zobrazit log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="684"/> + <translation type="obsolete">Zobrazit log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="676"/> <source>Show status</source> <translation>Zobrazit status</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="286"/> <source>Show annotated file</source> <translation>Zobrazit komentované soubory</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="696"/> <source>Revert changes</source> <translation>Vrátit změny</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="700"/> + <source>Merge changes</source> + <translation>Sloučit změny</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="430"/> + <source>Lock</source> + <translation>Zamknout</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="434"/> + <source>Unlock</source> + <translation>Odemknout</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="438"/> + <source>Break Lock</source> + <translation>Prolomit zámek</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="442"/> + <source>Steal Lock</source> + <translation>Scizit zámek</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="708"/> - <source>Merge changes</source> - <translation>Sloučit změny</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="434"/> - <source>Lock</source> - <translation>Zamknout</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="438"/> - <source>Unlock</source> - <translation>Odemknout</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="442"/> - <source>Break Lock</source> - <translation>Prolomit zámek</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="446"/> - <source>Steal Lock</source> - <translation>Scizit zámek</translation> + <source>Set Property</source> + <translation>Nastavit vlastnosti</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="710"/> + <source>List Properties</source> + <translation>Seznam vlastností</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="713"/> + <source>Delete Property</source> + <translation>Smazat vlastnost</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="716"/> - <source>Set Property</source> - <translation>Nastavit vlastnosti</translation> + <source>Select all local file entries</source> + <translation>Vybrat všechny lokální soubory</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="718"/> - <source>List Properties</source> - <translation>Seznam vlastností</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="721"/> - <source>Delete Property</source> - <translation>Smazat vlastnost</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="724"/> - <source>Select all local file entries</source> - <translation>Vybrat všechny lokální soubory</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="726"/> <source>Select all versioned file entries</source> <translation>Vybrat všechny soubory ve správě verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="720"/> <source>Select all local directory entries</source> <translation>Vybrat všechny lokální adresáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="730"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="722"/> <source>Select all versioned directory entries</source> <translation>Vybrat všechny adresáře ve správě verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="572"/> <source>Show repository info</source> <translation>Zobrazit info o repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="562"/> <source>Show log browser</source> <translation>Zobrazit log prohlížeč</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="733"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="725"/> <source>Configure...</source> <translation>Konfigurovat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="667"/> <source>Add to Changelist</source> <translation>Přidat do seznamu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="679"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="671"/> <source>Remove from Changelist</source> <translation>Odebrat ze seznamu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="547"/> <source>Copy</source> <translation type="unfinished">Kopírovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="549"/> <source>Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="681"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="271"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="267"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="693"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="685"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="276"/> <source>Show differences side-by-side (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="698"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="690"/> <source>Show differences (URLs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="712"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> @@ -54885,336 +55315,331 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/> - <source>Show log</source> - <translation>Zobrazit log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/> - <source>Show &log</source> - <translation>Zobrazit &log</translation> + <source>Show log browser</source> + <translation>Zobrazit log prohlížeč</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="104"/> - <source>Show the log of the local project</source> - <translation>Zobrazit log lokálního projektu</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation>Zobrazit dialog pro procházení logů lokálního projektu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="107"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation><b>Zobrazit log</b><p>Zobrazí log lokálního projektu.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="131"/> + <translation type="obsolete"><b>Zobrazit log</b><p>Zobrazí log lokálního projektu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/> <source>Show &difference</source> <translation>Zobrazit o&dlišnosti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="121"/> <source>Show the difference of the local project to the repository</source> <translation>Zobrazí odlišnosti mezi lokálním projektem a repozitářem</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="137"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Zobrazí odlišnosti mezi revizemi projektu v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="164"/> <source>Show status</source> <translation>Zobrazit status</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="164"/> <source>Show &status</source> <translation>Zobrazit &status</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="169"/> <source>Show the status of the local project</source> <translation>Zobrazit status lokálního projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="172"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Zobrazit status</b><p>Zobrazí status lokálního projektu.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="195"/> + <source>Tag in repository</source> + <translation>Vytvořit tag v repozitáři</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="195"/> + <source>&Tag in repository...</source> + <translation>Vytvořit &tag v repozitáři...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="200"/> + <source>Tag the local project in the repository</source> + <translation>Vytvořit Tag - značku z lokálního projektu do repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="203"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Vytvořit tag v repozitáři</b><p>Z lokálního projektu vytvoří značku - tag v repozitáři.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="210"/> - <source>Tag in repository</source> - <translation>Vytvořit tag v repozitáři</translation> + <source>Export from repository</source> + <translation>Exportovat z repozitáře</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="210"/> - <source>&Tag in repository...</source> - <translation>Vytvořit &tag v repozitáři...</translation> + <source>&Export from repository...</source> + <translation>&Exportovat z repozitáře...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="215"/> - <source>Tag the local project in the repository</source> - <translation>Vytvořit Tag - značku z lokálního projektu do repozitáře</translation> + <source>Export a project from the repository</source> + <translation>Export projekt z repozitáře</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="218"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Vytvořit tag v repozitáři</b><p>Z lokálního projektu vytvoří značku - tag v repozitáři.</p></translation> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>Exportovat z repozitáře</b><p>Exportuje projekt z repozitáře.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/> - <source>Export from repository</source> - <translation>Exportovat z repozitáře</translation> + <source>Command options</source> + <translation>Parametry příkazu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/> - <source>&Export from repository...</source> - <translation>&Exportovat z repozitáře...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="230"/> - <source>Export a project from the repository</source> - <translation>Export projekt z repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="233"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation><b>Exportovat z repozitáře</b><p>Exportuje projekt z repozitáře.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="240"/> - <source>Command options</source> - <translation>Parametry příkazu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="240"/> <source>Command &options...</source> <translation>&Parametry příkazu...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="229"/> <source>Show the VCS command options</source> <translation>Zobrazit parametry VCS příkazu</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="231"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation><b>Parametry příkazu...</b><p>Zobrazí se dialog s editací parametrů VCS příkazu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="238"/> + <source>Revert changes</source> + <translation>Vrátit změny</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="238"/> + <source>Re&vert changes</source> + <translation>&Vrátit změny</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="243"/> + <source>Revert all changes made to the local project</source> + <translation>Vrátit všechny změny, které byly provedeny v lokálním projektu</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="246"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation><b>Parametry příkazu...</b><p>Zobrazí se dialog s editací parametrů VCS příkazu.</p></translation> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation><b>Vrátit změny</b><p>Vrátí se všechny změny, které byly provedeny v lokálním projektu.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/> - <source>Revert changes</source> - <translation>Vrátit změny</translation> + <source>Merge</source> + <translation>Sloučit</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/> - <source>Re&vert changes</source> - <translation>&Vrátit změny</translation> + <source>Mer&ge changes...</source> + <translation>&Sloučit změny...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="258"/> - <source>Revert all changes made to the local project</source> - <translation>Vrátit všechny změny, které byly provedeny v lokálním projektu</translation> + <source>Merge changes of a tag/revision into the local project</source> + <translation>Sloučit změny tagu/revize do lokálního projektu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="261"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation><b>Vrátit změny</b><p>Vrátí se všechny změny, které byly provedeny v lokálním projektu.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="268"/> - <source>Merge</source> - <translation>Sloučit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="268"/> - <source>Mer&ge changes...</source> - <translation>&Sloučit změny...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="273"/> - <source>Merge changes of a tag/revision into the local project</source> - <translation>Sloučit změny tagu/revize do lokálního projektu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="276"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Sloučit</b><p>Sloučí se změny tagu/revize do lokálního projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="269"/> <source>Switch</source> <translation>Přepnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="269"/> <source>S&witch...</source> <translation>&Přepnout...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="274"/> <source>Switch the local copy to another tag/branch</source> <translation>Přepnout lokální kopii do jiného tagu/větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="277"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>Přepnout</b><p>Přepne lokální kopii do jiného tagu/větve.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> <source>Cleanup</source> <translation>Vyčistit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> <source>Cleanu&p</source> <translation>V&yčistit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="303"/> <source>Cleanup the local project</source> <translation>Vyčistit lokální projekt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="306"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Vyčistit</b><p>Provede úklid lokálního projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="328"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="313"/> <source>Execute command</source> <translation>Provést příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="328"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="313"/> <source>E&xecute command...</source> <translation>P&rovést příkaz...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="317"/> <source>Execute an arbitrary VCS command</source> <translation>Provede se libovolný VCS příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="320"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation><b>Provést příkaz</b><p>Otevře se dialogové okno pro zadání libovolného příkazu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="327"/> <source>List tags</source> <translation>Seznam tagů</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="327"/> <source>List tags...</source> <translation>Seznam tagů...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="331"/> <source>List tags of the project</source> <translation>Seznam tagů projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="334"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Seznam tagů</b><p>Zobrazí seznam tagů projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="341"/> <source>List branches</source> <translation>Seznam větví</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="341"/> <source>List branches...</source> <translation>Seznam větví...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="345"/> <source>List branches of the project</source> <translation>Seznam větví projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="348"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Seznam větví</b><p>Zobrazí seznam větví projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="355"/> <source>List repository contents</source> <translation>Seznam obsahu repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="355"/> <source>List repository contents...</source> <translation>Seznam obsahu repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="374"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="359"/> <source>Lists the contents of the repository</source> <translation>Vypisuje seznam obsahu repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="377"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="362"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation><b>Seznam obsahu repozitáře</b><p>Zobrazuje seznam obsahu repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="369"/> <source>Set Property</source> <translation>Nastavit vlastnosti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="369"/> <source>Set Property...</source> <translation>Nastavit vlastnosti...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="373"/> <source>Set a property for the project files</source> <translation>Nastaví vlastnosti souborů projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="376"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation><b>Nastavit vlastnosti</b><p>Nastavuje vlastnosti souborů projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="383"/> <source>List Properties</source> <translation>Seznam vlastností</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="383"/> <source>List Properties...</source> <translation>Seznam vlastností...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="387"/> <source>List properties of the project files</source> <translation>Seznam vlastností souborů projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="390"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation><b>Seznam vlastností</b><p>Vypisuje seznam vlastností souborů projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="397"/> <source>Delete Property</source> <translation>Smazat vlastnost</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="397"/> <source>Delete Property...</source> <translation>Smazat vlastnost...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="416"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="401"/> <source>Delete a property for the project files</source> <translation>Smaže vlastnost pro soubory projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="419"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="404"/> <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> <translation><b>Smazat vlastnost</b><p>Smaže vlastnost pro soubory projektu.</p></translation> </message> @@ -55234,172 +55659,162 @@ <translation type="obsolete"><b>Zobrazit info repozitáře</b><p>Zobrazí nějaké infomace související s repozitářem pro lokální projekt.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="426"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/> <source>Relocate</source> <translation>Přemístit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="426"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/> <source>Relocate...</source> <translation>Přemístit...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="431"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="416"/> <source>Relocate the working copy to a new repository URL</source> <translation>Přemístit pracovní kopii do nového URL repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="434"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="419"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>Přemístit</b><p>Pracovní kopie se přemístí na nové URL repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="153"/> <source>Show the difference of the project between two repository URLs</source> <translation>Zobrazit odlišnosti v projektu mezi dvěma repozitáři na URL</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="427"/> + <source>Repository Browser</source> + <translation>Prohlížeč repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="427"/> + <source>Repository Browser...</source> + <translation>Prohlížeč repozitáře...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="432"/> + <source>Show the Repository Browser dialog</source> + <translation>Zobrazit dialog prohlížeče repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="435"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation><b>Prohlížeč repozitáře</b><p>Zobrazí se dialogové okno prohlížeče repozitáře.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="107"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation><b>Zobrazit log prohlížeč</b><p>Zobrazí se dialogové okno pro procházení logů lokálního projektu. Jako první je zobrazen limit maximálního přenosu. Více záznamů může být zobrazeno později.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> - <source>Repository Browser</source> - <translation>Prohlížeč repozitáře</translation> + <source>Configure</source> + <translation>Konfigurovat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> - <source>Repository Browser...</source> - <translation>Prohlížeč repozitáře...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="447"/> - <source>Show the Repository Browser dialog</source> - <translation>Zobrazit dialog prohlížeče repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="450"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation><b>Prohlížeč repozitáře</b><p>Zobrazí se dialogové okno prohlížeče repozitáře.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="114"/> - <source>Show log browser</source> - <translation>Zobrazit log prohlížeč</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="119"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>Zobrazit dialog pro procházení logů lokálního projektu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="122"/> - <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> - <translation><b>Zobrazit log prohlížeč</b><p>Zobrazí se dialogové okno pro procházení logů lokálního projektu. Jako první je zobrazen limit maximálního přenosu. Více záznamů může být zobrazeno později.</p></translation> + <source>Configure...</source> + <translation>Konfigurovat...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="446"/> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation>Zobrazit konfigurační dialog s vybranou Subversion stranou</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="449"/> + <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> + <translation><b>Konfigurovat</b><p>Zobrazit konfigurační dialog s vybranou Subversion stranou.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="288"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="291"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <source>Show change lists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="184"/> + <source>Show the change lists and associated files of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="187"/> + <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> - <source>Configure</source> - <translation>Konfigurovat</translation> + <source>Upgrade</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> - <source>Configure...</source> - <translation>Konfigurovat...</translation> + <source>Upgrade...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="461"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation>Zobrazit konfigurační dialog s vybranou Subversion stranou</translation> + <source>Upgrade the working copy to the current format</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="464"/> - <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> - <translation><b>Konfigurovat</b><p>Zobrazit konfigurační dialog s vybranou Subversion stranou.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="303"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="306"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="194"/> - <source>Show change lists</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="199"/> - <source>Show the change lists and associated files of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="202"/> - <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="472"/> - <source>Upgrade</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="472"/> - <source>Upgrade...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="476"/> - <source>Upgrade the working copy to the current format</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="479"/> <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="132"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="148"/> <source>Show differences (URLs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="124"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="140"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="156"/> <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="559"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="543"/> <source>Subversion (svn)</source> <translation type="unfinished">Subversion (svn)</translation> </message> @@ -59649,22 +60064,22 @@ <translation>Vše</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="66"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="62"/> <source>Language:</source> <translation>Jazyk:</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="70"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="69"/> <source>GROUP</source> <translation></translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="103"/> <source>Close dialog</source> <translation>Zavřít dialog</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="103"/> <source>Do you really want to close the dialog?</source> <translation>Opravdu chcete zavřít dialog?</translation> </message> @@ -61393,7 +61808,7 @@ <context> <name>UnittestDialog</name> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.py" line="403"/> <source>Unittest</source> <translation></translation> </message> @@ -61583,57 +61998,57 @@ <translation>^Chyby: </translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="266"/> + <location filename="../PyUnit/UnittestDialog.py" line="269"/> <source>You must enter a test suite file.</source> <translation>Musíte zadat soubor soupravy testu.</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="274"/> + <location filename="../PyUnit/UnittestDialog.py" line="277"/> <source>Preparing Testsuite</source> <translation>Příprava soupravy testu</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="469"/> + <location filename="../PyUnit/UnittestDialog.py" line="475"/> <source>Running</source> <translation>Běží</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="634"/> + <location filename="../PyUnit/UnittestDialog.py" line="640"/> <source>Show Source</source> <translation>Zobrazit zdroj</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="206"/> + <location filename="../PyUnit/UnittestDialog.py" line="209"/> <source>Python Files (*.py);;All Files (*)</source> <translation>Python soubory (*.py);;Všechny soubory (*)</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="202"/> + <location filename="../PyUnit/UnittestDialog.py" line="205"/> <source>Python3 Files ({1});;Python2 Files ({0});;All Files (*)</source> <translation>Python3 soubory ({1});;Python2 soubory ({0});;Všechny soubory (*)</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.py" line="403"/> <source><p>Unable to run test <b>{0}</b>.<br>{1}<br>{2}</p></source> <translation><p>Nelze spustit test <b>{0}</b>.<br>{1}<br>{2}</p></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="493"/> + <location filename="../PyUnit/UnittestDialog.py" line="499"/> <source>Ran {0} test in {1:.3f}s</source> <translation>Doběhl {0} test za {1:.3f}s</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="497"/> + <location filename="../PyUnit/UnittestDialog.py" line="503"/> <source>Ran {0} tests in {1:.3f}s</source> <translation>Doběhlo {0} testů za {1:.3f}s</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="514"/> + <location filename="../PyUnit/UnittestDialog.py" line="520"/> <source>Failure: {0}</source> <translation>Selhalo: {0}</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="529"/> + <location filename="../PyUnit/UnittestDialog.py" line="535"/> <source>Error: {0}</source> <translation>Chyby: {0}</translation> </message> @@ -61668,17 +62083,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="544"/> + <location filename="../PyUnit/UnittestDialog.py" line="550"/> <source> Skipped: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="559"/> + <location filename="../PyUnit/UnittestDialog.py" line="565"/> <source> Expected Failure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="573"/> + <location filename="../PyUnit/UnittestDialog.py" line="579"/> <source> Unexpected Success</source> <translation type="unfinished"></translation> </message> @@ -64058,7 +64473,7 @@ <context> <name>Utilities</name> <message> - <location filename="../Utilities/__init__.py" line="1400"/> + <location filename="../Utilities/__init__.py" line="1403"/> <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> @@ -64277,13 +64692,13 @@ </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="38"/> - <source>&Locals Filter</source> - <translation>Filtr &lokálních proměnných</translation> + <source>&Locals Viewer</source> + <translation type="unfinished">Filtr &lokálních proměnných</translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="48"/> - <source>&Globals Filter</source> - <translation>Filtr &globálních proměnných</translation> + <source>&Globals Viewer</source> + <translation type="unfinished">Filtr &globálních proměnných</translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="58"/> @@ -64293,8 +64708,8 @@ <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="61"/> <source><b>Locals Filter List</b> -<p>Select the variable types you want to be filtered out of the locals variables list.</p<</source> - <translation><b>Filtrovaný seznam lokálních proměnných</b><p>Výběr typů lokálních proměnných, které chcete filtrovat.</p></translation> +<p>Select the variable types you want to be shown in the local variables viewer.</p<</source> + <translation type="unfinished"><b>Filtrovaný seznam lokálních proměnných</b><p>Výběr typů lokálních proměnných, které chcete filtrovat.</p></translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="78"/> @@ -64304,14 +64719,19 @@ <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="81"/> <source><b>Globals Filter List</b> -<p>Select the variable types you want to be filtered out of the globals variables list.</p<</source> - <translation><b>Filtrovaný seznam globálních proměnných</b><p>Výběr typů globálních proměnných, které chcete filtrovat.</p></translation> +<p>Select the variable types you want to be shown in the global variables viewer.</p<</source> + <translation type="unfinished"><b>Filtrovaný seznam globálních proměnných</b><p>Výběr typů globálních proměnných, které chcete filtrovat.</p></translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.py" line="42"/> <source>Save Default</source> <translation>Uložit default</translation> </message> + <message> + <location filename="../Debugger/VariablesFilterDialog.ui" line="28"/> + <source>Select the variable types to be shown in the variables viewers:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VariablesViewer</name> @@ -64881,7 +65301,7 @@ <translation>Obnovit</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="532"/> + <location filename="../VCS/ProjectHelper.py" line="533"/> <source>The project should be reread. Do this now?</source> <translation>Projekt bude znovu načten. Má se provést?</translation> </message> @@ -64896,7 +65316,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="532"/> + <location filename="../VCS/ProjectHelper.py" line="533"/> <source>Switch</source> <translation type="unfinished">Přepnout</translation> </message> @@ -64976,17 +65396,17 @@ <context> <name>VersionControl</name> <message> - <location filename="../VCS/VersionControl.py" line="573"/> + <location filename="../VCS/VersionControl.py" line="563"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../VCS/VersionControl.py" line="704"/> + <location filename="../VCS/VersionControl.py" line="694"/> <source>Repository status checking is switched off</source> <translation>Kontrolování stavu v repozitáři je vypnuto</translation> </message> <message> - <location filename="../VCS/VersionControl.py" line="573"/> + <location filename="../VCS/VersionControl.py" line="563"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> @@ -72252,46 +72672,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1459"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1426"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Rodič #{0}</b></td><td></td></tr><tr><td><b>Množina změn</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Větve</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1446"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Množina změn</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Rodiče</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -72299,12 +72719,12 @@ <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -72315,13 +72735,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2078"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2083"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> @@ -72828,50 +73248,55 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="240"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="243"/> <source>do not assign a lambda expression, use a def</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="243"/> - <source>ambiguous variable name '{0}'</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="246"/> - <source>ambiguous class definition '{0}'</source> + <source>ambiguous variable name '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="249"/> - <source>ambiguous function definition '{0}'</source> + <source>ambiguous class definition '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="252"/> - <source>{0}: {1}</source> + <source>ambiguous function definition '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="255"/> + <source>{0}: {1}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="258"/> <source>{0}</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="240"/> + <source>do not use bare except</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>subversion</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1741"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1720"/> <source>unknown</source> <translation>neznámý</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1606"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1586"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Informace z repozitáře</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Aktuální revize</b></td><td>{2}</td></tr><tr><td><b>Revize zápisu změn</b></td><td>{3}</td></tr><tr><td><b>Datum zápisu změn</b></td><td>{4}</td></tr><tr><td><b>Čas zápisu změn</b></td><td>{5}</td></tr><tr><td><b>Poslední autor</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1746"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1725"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Informace z repozitáře</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Aktuální revize</b></td><td>{4}</td></tr><tr><td><b>Revize zápisu změn</b></td><td>{5}</td></tr><tr><td><b>Datum zápisu změn</b></td><td>{6}</td></tr><tr><td><b>Čas zápisu změn</b></td><td>{7}</td></tr><tr><td><b>Poslední autor</b></td><td>{8}</td></tr></table></translation> </message>
diff -r 852016bbdedb -r c307358a2ecc i18n/eric6_de.ts --- a/i18n/eric6_de.ts Fri Jan 27 19:18:52 2017 +0100 +++ b/i18n/eric6_de.ts Fri Feb 03 19:20:59 2017 +0100 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.1" language="de"> +<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -1938,8 +1937,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="145"/> - <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="../WebBrowser/Bookmarks/BookmarksMenu.py" line="163"/> @@ -1948,8 +1947,8 @@ </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="166"/> - <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="../WebBrowser/Bookmarks/BookmarksMenu.py" line="169"/> @@ -2037,8 +2036,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="93"/> - <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="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="88"/> @@ -2047,8 +2046,8 @@ </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="91"/> - <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="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="94"/> @@ -3520,147 +3519,147 @@ <context> <name>CodeStyleFixer</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="494"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> <source>Triple single quotes converted to triple double quotes.</source> <translation>Dreifache Einfachanführungszeichen in dreifache Doppelanführungszeichen umgewandelt.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> - <source>Introductory quotes corrected to be {0}"""</source> - <translation>Einleitende Anführungszeichen in {0}""" korrigiert</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="500"/> - <source>Single line docstring put on one line.</source> - <translation>Einzeiligen Docstring auf eine Zeile gebracht.</translation> + <source>Introductory quotes corrected to be {0}"""</source> + <translation>Einleitende Anführungszeichen in {0}""" korrigiert</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="503"/> + <source>Single line docstring put on one line.</source> + <translation>Einzeiligen Docstring auf eine Zeile gebracht.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="506"/> <source>Period added to summary line.</source> <translation>Punkt an die Zusammenfassungszeile angefügt.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> <source>Blank line before function/method docstring removed.</source> <translation>Leerzeile vor Funktions-/Methodendocstring entfernt.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="509"/> - <source>Blank line inserted before class docstring.</source> - <translation>Leerzeile vor Klassendocstring eingefügt.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="512"/> - <source>Blank line inserted after class docstring.</source> - <translation>Leerzeile nach Klassendocstring eingefügt.</translation> + <source>Blank line inserted before class docstring.</source> + <translation>Leerzeile vor Klassendocstring eingefügt.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="515"/> - <source>Blank line inserted after docstring summary.</source> - <translation>Leerzeile nach Docstring Zusammenfassung eingefügt.</translation> + <source>Blank line inserted after class docstring.</source> + <translation>Leerzeile nach Klassendocstring eingefügt.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="518"/> - <source>Blank line inserted after last paragraph of docstring.</source> - <translation>Leerzeile nach letztem Abschnitt des Docstring eingefügt.</translation> + <source>Blank line inserted after docstring summary.</source> + <translation>Leerzeile nach Docstring Zusammenfassung eingefügt.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="521"/> - <source>Leading quotes put on separate line.</source> - <translation>Einleitende Anführungszeichen auf separate Zeile gesetzt.</translation> + <source>Blank line inserted after last paragraph of docstring.</source> + <translation>Leerzeile nach letztem Abschnitt des Docstring eingefügt.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="524"/> - <source>Trailing quotes put on separate line.</source> - <translation>Schließende Anführungszeichen auf separate Zeile gesetzt.</translation> + <source>Leading quotes put on separate line.</source> + <translation>Einleitende Anführungszeichen auf separate Zeile gesetzt.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="527"/> + <source>Trailing quotes put on separate line.</source> + <translation>Schließende Anführungszeichen auf separate Zeile gesetzt.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> <source>Blank line before class docstring removed.</source> <translation>Leerzeile vor Klassendocstring entfernt.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> - <source>Blank line after class docstring removed.</source> - <translation>Leerzeile nach Klassendocstring entfernt.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="536"/> - <source>Blank line after function/method docstring removed.</source> - <translation>Leerzeile nach Funktions-/Methodendocstring entfernt.</translation> + <source>Blank line after class docstring removed.</source> + <translation>Leerzeile nach Klassendocstring entfernt.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="539"/> - <source>Blank line after last paragraph removed.</source> - <translation>Leerzeile nach letzten Abschnitt entfernt.</translation> + <source>Blank line after function/method docstring removed.</source> + <translation>Leerzeile nach Funktions-/Methodendocstring entfernt.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="542"/> - <source>Tab converted to 4 spaces.</source> - <translation>Tabulator in 4 Leerzeichen gewandelt.</translation> + <source>Blank line after last paragraph removed.</source> + <translation>Leerzeile nach letzten Abschnitt entfernt.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="545"/> - <source>Indentation adjusted to be a multiple of four.</source> - <translation>Einrückung auf ein Vielfaches von vier korrigiert.</translation> + <source>Tab converted to 4 spaces.</source> + <translation>Tabulator in 4 Leerzeichen gewandelt.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="548"/> - <source>Indentation of continuation line corrected.</source> - <translation>Einrückung der Fortsetzungszeile korrigiert.</translation> + <source>Indentation adjusted to be a multiple of four.</source> + <translation>Einrückung auf ein Vielfaches von vier korrigiert.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="551"/> - <source>Indentation of closing bracket corrected.</source> - <translation>Einrückung der schließenden Klammer korrigiert.</translation> + <source>Indentation of continuation line corrected.</source> + <translation>Einrückung der Fortsetzungszeile korrigiert.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="554"/> - <source>Missing indentation of continuation line corrected.</source> - <translation>Fehlende Einrückung der Fortsetzungszeile korrigiert.</translation> + <source>Indentation of closing bracket corrected.</source> + <translation>Einrückung der schließenden Klammer korrigiert.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="557"/> - <source>Closing bracket aligned to opening bracket.</source> - <translation>Schließende Klammer an öffnender Klammer ausgerichtet.</translation> + <source>Missing indentation of continuation line corrected.</source> + <translation>Fehlende Einrückung der Fortsetzungszeile korrigiert.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="560"/> - <source>Indentation level changed.</source> - <translation>Einrückungsebene geändert.</translation> + <source>Closing bracket aligned to opening bracket.</source> + <translation>Schließende Klammer an öffnender Klammer ausgerichtet.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="563"/> - <source>Indentation level of hanging indentation changed.</source> - <translation>Einrückungsebene der hängenden Einrückung geändert.</translation> + <source>Indentation level changed.</source> + <translation>Einrückungsebene geändert.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="566"/> + <source>Indentation level of hanging indentation changed.</source> + <translation>Einrückungsebene der hängenden Einrückung geändert.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="569"/> <source>Visual indentation corrected.</source> <translation>Visuelle Einrückung korrigiert.</translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="584"/> + <source>Extraneous whitespace removed.</source> + <translation>Überzählige Leerzeichen gelöscht.</translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="581"/> - <source>Extraneous whitespace removed.</source> - <translation>Überzählige Leerzeichen gelöscht.</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="578"/> <source>Missing whitespace added.</source> <translation>Fehlende Leerzeichen eingefügt.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="584"/> - <source>Whitespace around comment sign corrected.</source> - <translation>Leerzeichen um Kommentarzeichen korrigiert.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="587"/> + <source>Whitespace around comment sign corrected.</source> + <translation>Leerzeichen um Kommentarzeichen korrigiert.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="590"/> <source>One blank line inserted.</source> <translation>Eine Leerzeile eingefügt.</translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="591"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> <source>%n blank line(s) inserted.</source> <translation> <numerusform>Eine Leerzeile eingefügt.</numerusform> @@ -3668,7 +3667,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="597"/> <source>%n superfluous lines removed</source> <translation> <numerusform>Eine überflüssige Zeile gelöscht</numerusform> @@ -3676,77 +3675,77 @@ </translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="598"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="601"/> <source>Superfluous blank lines removed.</source> <translation>Überflüssige Leerzeilen gelöscht.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="601"/> - <source>Superfluous blank lines after function decorator removed.</source> - <translation>Überflüssige Leerzeilen nach Funktionsdekorator gelöscht.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="604"/> - <source>Imports were put on separate lines.</source> - <translation>Imports wurden auf separate Zeilen verteilt.</translation> + <source>Superfluous blank lines after function decorator removed.</source> + <translation>Überflüssige Leerzeilen nach Funktionsdekorator gelöscht.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="607"/> - <source>Long lines have been shortened.</source> - <translation>Lange Zeilen wurden gekürzt.</translation> + <source>Imports were put on separate lines.</source> + <translation>Imports wurden auf separate Zeilen verteilt.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="610"/> + <source>Long lines have been shortened.</source> + <translation>Lange Zeilen wurden gekürzt.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="613"/> <source>Redundant backslash in brackets removed.</source> <translation>Redundante Backslashes in Klammern entfernt.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="616"/> - <source>Compound statement corrected.</source> - <translation>Compund Statement korrigiert.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="619"/> - <source>Comparison to None/True/False corrected.</source> - <translation>Vergleich mit None/True/False korrigiert.</translation> + <source>Compound statement corrected.</source> + <translation>Compund Statement korrigiert.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="622"/> - <source>'{0}' argument added.</source> - <translation>'{0}' Argument hinzugefügt.</translation> + <source>Comparison to None/True/False corrected.</source> + <translation>Vergleich mit None/True/False korrigiert.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="625"/> - <source>'{0}' argument removed.</source> - <translation>'{0}' Argument entfernt.</translation> + <source>'{0}' argument added.</source> + <translation>'{0}' Argument hinzugefügt.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="628"/> - <source>Whitespace stripped from end of line.</source> - <translation>Leerzeichen am Zeilenende entfernt.</translation> + <source>'{0}' argument removed.</source> + <translation>'{0}' Argument entfernt.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="631"/> - <source>newline added to end of file.</source> - <translation>Zeilenvorschub am Dateiende angefügt.</translation> + <source>Whitespace stripped from end of line.</source> + <translation>Leerzeichen am Zeilenende entfernt.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="634"/> - <source>Superfluous trailing blank lines removed from end of file.</source> - <translation>Überflüssige Leerzeilen am Dateiende gelöscht.</translation> + <source>newline added to end of file.</source> + <translation>Zeilenvorschub am Dateiende angefügt.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="637"/> + <source>Superfluous trailing blank lines removed from end of file.</source> + <translation>Überflüssige Leerzeilen am Dateiende gelöscht.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="640"/> <source>'<>' replaced by '!='.</source> <translation>„<>“ durch „!=“ ersetzt.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="641"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="644"/> <source>Could not save the file! Skipping it. Reason: {0}</source> <translation>Datei konnte nicht gespeichert werden! Ursache: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="710"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="713"/> <source> no message defined for code '{0}'</source> <translation> keine Nachricht für '{0}' definiert</translation> </message> @@ -7016,197 +7015,197 @@ <context> <name>DocStyleChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="260"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="263"/> <source>module is missing a docstring</source> <translation>Modul hat keinen Docstring</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="262"/> - <source>public function/method is missing a docstring</source> - <translation>Öffentliche Funktion/Methode hat keinen Docstring</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="265"/> - <source>private function/method may be missing a docstring</source> - <translation>Private Funktion/Methode hat keinen Docstring</translation> + <source>public function/method is missing a docstring</source> + <translation>Öffentliche Funktion/Methode hat keinen Docstring</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="268"/> + <source>private function/method may be missing a docstring</source> + <translation>Private Funktion/Methode hat keinen Docstring</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="271"/> <source>public class is missing a docstring</source> <translation>Öffentliche Klasse hat keinen Docstring</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="270"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="273"/> <source>private class may be missing a docstring</source> <translation>Private Klasse hat keinen Docstring</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="272"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="275"/> <source>docstring not surrounded by """</source> <translation>Docstring nicht durch """ eingeschlossen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="274"/> - <source>docstring containing \ not surrounded by r"""</source> - <translation>Docstring, der \ enthält, nicht durch r""" eingeschlossen</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="277"/> - <source>docstring containing unicode character not surrounded by u"""</source> - <translation>Docstring, der Unicode Zeichen enthält, nicht durch u""" eingeschlossen</translation> + <source>docstring containing \ not surrounded by r"""</source> + <translation>Docstring, der \ enthält, nicht durch r""" eingeschlossen</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="280"/> + <source>docstring containing unicode character not surrounded by u"""</source> + <translation>Docstring, der Unicode Zeichen enthält, nicht durch u""" eingeschlossen</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="283"/> <source>one-liner docstring on multiple lines</source> <translation>einzeiliger Docstring über mehrere Zeilen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="282"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="285"/> <source>docstring has wrong indentation</source> <translation>Docstring hat falsche Einrückung</translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="328"/> + <source>docstring summary does not end with a period</source> + <translation>Docstring Zusammenfassung endet nicht mit einem Punkt</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="291"/> + <source>docstring summary is not in imperative mood (Does instead of Do)</source> + <translation>Docstring Zusammenfassung nicht im Imperativ (Tut anstelle Tue)</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="295"/> + <source>docstring summary looks like a function's/method's signature</source> + <translation>Docstring Zusammenfassung scheint Funktion-/Methodensignatur zu sein</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="298"/> + <source>docstring does not mention the return value type</source> + <translation>Docstring erwähnt nicht den Typ des Rückgabewertes</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="301"/> + <source>function/method docstring is separated by a blank line</source> + <translation>Funktions-/Methodendocstring ist durch eine Leerzeile abgetrennt</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="304"/> + <source>class docstring is not preceded by a blank line</source> + <translation>Klassendocstring hat keine führende Leerzeile</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="307"/> + <source>class docstring is not followed by a blank line</source> + <translation>Klassendocstring hat keine nachfolgende Leerzeile</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="362"/> + <source>docstring summary is not followed by a blank line</source> + <translation>Docstring Zusammenfassung hat keine folgende Leerzeile</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="313"/> + <source>last paragraph of docstring is not followed by a blank line</source> + <translation>letzter Abschnitt des Docstring hat keine folgende Leerzeile</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="317"/> + <source>private function/method is missing a docstring</source> + <translation>Private Funktion/Methode hat keinen Docstring</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="320"/> + <source>private class is missing a docstring</source> + <translation>Private Klasse hat keinen Docstring</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="322"/> + <source>leading quotes of docstring not on separate line</source> + <translation>einleitende Anführungszeichen nicht auf separater Zeile</translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="325"/> - <source>docstring summary does not end with a period</source> - <translation>Docstring Zusammenfassung endet nicht mit einem Punkt</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="288"/> - <source>docstring summary is not in imperative mood (Does instead of Do)</source> - <translation>Docstring Zusammenfassung nicht im Imperativ (Tut anstelle Tue)</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="292"/> - <source>docstring summary looks like a function's/method's signature</source> - <translation>Docstring Zusammenfassung scheint Funktion-/Methodensignatur zu sein</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="295"/> - <source>docstring does not mention the return value type</source> - <translation>Docstring erwähnt nicht den Typ des Rückgabewertes</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="298"/> - <source>function/method docstring is separated by a blank line</source> - <translation>Funktions-/Methodendocstring ist durch eine Leerzeile abgetrennt</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="301"/> - <source>class docstring is not preceded by a blank line</source> - <translation>Klassendocstring hat keine führende Leerzeile</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="304"/> - <source>class docstring is not followed by a blank line</source> - <translation>Klassendocstring hat keine nachfolgende Leerzeile</translation> + <source>trailing quotes of docstring not on separate line</source> + <translation>schließende Anführungszeichen nicht auf separater Zeile</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="332"/> + <source>docstring does not contain a @return line but function/method returns something</source> + <translation>Docstring enthält keine @return Zeile obwohl die Funktion/Methode etwas zurückgibt</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="336"/> + <source>docstring contains a @return line but function/method doesn't return anything</source> + <translation>Docstring enthält eine @return Zeile obwohl die Funktion/Methode nichts zurückgibt</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="340"/> + <source>docstring does not contain enough @param/@keyparam lines</source> + <translation>Docstring enthält nicht genügend @param/@keyparam Zeilen</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="343"/> + <source>docstring contains too many @param/@keyparam lines</source> + <translation>Docstring enthält zu viele @param/@keyparam Zeilen</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="346"/> + <source>keyword only arguments must be documented with @keyparam lines</source> + <translation>'keyword only' Argumente müssen mit @keyparam Zeilen dokumentiert werden</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="349"/> + <source>order of @param/@keyparam lines does not match the function/method signature</source> + <translation>Reihenfolge der @param/@keyparam Zeilen stimmt nicht mit der Funktions-/Methodensignatur überein</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="352"/> + <source>class docstring is preceded by a blank line</source> + <translation>Klassendocstring hat eine führende Leerzeile</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="354"/> + <source>class docstring is followed by a blank line</source> + <translation>Klassendocstring hat eine nachfolgende Leerzeile</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="356"/> + <source>function/method docstring is preceded by a blank line</source> + <translation>Funktions-/Methodendocstring hat eine führende Leerzeile</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="359"/> - <source>docstring summary is not followed by a blank line</source> - <translation>Docstring Zusammenfassung hat keine folgende Leerzeile</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="310"/> - <source>last paragraph of docstring is not followed by a blank line</source> - <translation>letzter Abschnitt des Docstring hat keine folgende Leerzeile</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="314"/> - <source>private function/method is missing a docstring</source> - <translation>Private Funktion/Methode hat keinen Docstring</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="317"/> - <source>private class is missing a docstring</source> - <translation>Private Klasse hat keinen Docstring</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="319"/> - <source>leading quotes of docstring not on separate line</source> - <translation>einleitende Anführungszeichen nicht auf separater Zeile</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="322"/> - <source>trailing quotes of docstring not on separate line</source> - <translation>schließende Anführungszeichen nicht auf separater Zeile</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="329"/> - <source>docstring does not contain a @return line but function/method returns something</source> - <translation>Docstring enthält keine @return Zeile obwohl die Funktion/Methode etwas zurückgibt</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="333"/> - <source>docstring contains a @return line but function/method doesn't return anything</source> - <translation>Docstring enthält eine @return Zeile obwohl die Funktion/Methode nichts zurückgibt</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="337"/> - <source>docstring does not contain enough @param/@keyparam lines</source> - <translation>Docstring enthält nicht genügend @param/@keyparam Zeilen</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="340"/> - <source>docstring contains too many @param/@keyparam lines</source> - <translation>Docstring enthält zu viele @param/@keyparam Zeilen</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="343"/> - <source>keyword only arguments must be documented with @keyparam lines</source> - <translation>'keyword only' Argumente müssen mit @keyparam Zeilen dokumentiert werden</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="346"/> - <source>order of @param/@keyparam lines does not match the function/method signature</source> - <translation>Reihenfolge der @param/@keyparam Zeilen stimmt nicht mit der Funktions-/Methodensignatur überein</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="349"/> - <source>class docstring is preceded by a blank line</source> - <translation>Klassendocstring hat eine führende Leerzeile</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="351"/> - <source>class docstring is followed by a blank line</source> - <translation>Klassendocstring hat eine nachfolgende Leerzeile</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="353"/> - <source>function/method docstring is preceded by a blank line</source> - <translation>Funktions-/Methodendocstring hat eine führende Leerzeile</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="356"/> <source>function/method docstring is followed by a blank line</source> <translation>Funktions-/Methodendocstring hat eine nachfolgende Leerzeile</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="362"/> - <source>last paragraph of docstring is followed by a blank line</source> - <translation>letzter Abschnitt des Docstring hat eine folgende Leerzeile</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="365"/> + <source>last paragraph of docstring is followed by a blank line</source> + <translation>letzter Abschnitt des Docstring hat eine folgende Leerzeile</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="368"/> <source>docstring does not contain a @exception line but function/method raises an exception</source> <translation>Docstring enthält keine @exception Zeile obwohl die Funktion/Methode eine Ausnahme erzeugt</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="369"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="372"/> <source>docstring contains a @exception line but function/method doesn't raise an exception</source> <translation>Docstring enthält eine @exception Zeile obwohl die Funktion/Methode keine Ausnahme erzeugt</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="374"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="377"/> <source>{0}: {1}</source> <translation>{0}: {1}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="284"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="287"/> <source>docstring does not contain a summary</source> <translation>Docstring enthält keine Zusammenfassung</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="327"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="330"/> <source>docstring summary does not start with '{0}'</source> <translation>Docstring Zusammenfassung beginnt nicht mit '{0}'</translation> </message> @@ -8995,892 +8994,892 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2878"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source>Open File</source> <translation>Datei öffnen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3041"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source>Save File</source> <translation>Datei sichern</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="658"/> - <source>Undo</source> - <translation>Rückgängig</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="661"/> - <source>Redo</source> - <translation>Wiederherstellen</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="668"/> - <source>Cut</source> - <translation>Ausschneiden</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="671"/> - <source>Copy</source> - <translation>Kopieren</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="674"/> - <source>Paste</source> - <translation>Einfügen</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="679"/> - <source>Indent</source> - <translation>Einrücken</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="682"/> - <source>Unindent</source> - <translation>Einrücken rückgängig</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="685"/> - <source>Comment</source> - <translation>Kommentar</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="688"/> - <source>Uncomment</source> - <translation>Kommentar entfernen</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="768"/> - <source>Close</source> - <translation>Schließen</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="774"/> - <source>Save</source> - <translation>Speichern</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="777"/> - <source>Save As...</source> - <translation>Speichern unter...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="700"/> - <source>Select all</source> - <translation>Alles auswählen</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="701"/> - <source>Deselect all</source> - <translation>Auswahl aufheben</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="698"/> - <source>Select to brace</source> - <translation>Zur Klammer auswählen</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="793"/> - <source>Print</source> - <translation>Drucken</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2443"/> - <source>Printing...</source> - <translation>Drucke...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2460"/> - <source>Printing completed</source> - <translation>Drucken beendet</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2462"/> - <source>Error while printing</source> - <translation>Fehler beim Drucken</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2465"/> - <source>Printing aborted</source> - <translation>Drucken abgebrochen</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6465"/> - <source>File changed</source> - <translation>Datei geändert</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="837"/> - <source>Check</source> - <translation>Prüfen</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2823"/> - <source>File Modified</source> - <translation>Datei geändert</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="859"/> - <source>Code metrics...</source> - <translation>Quelltextmetriken...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="860"/> - <source>Code coverage...</source> - <translation>Quelltext Abdeckung...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="868"/> - <source>Profile data...</source> - <translation>Profildaten...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="857"/> - <source>Show</source> - <translation>Zeige</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="691"/> - <source>Stream Comment</source> - <translation>Stream Kommentar</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="694"/> - <source>Box Comment</source> - <translation>Box Kommentar</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1752"/> - <source>Modification of Read Only file</source> - <translation>Änderungsversuch für eine schreibgeschützte Datei</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1752"/> - <source>You are attempting to change a read only file. Please save to a different file first.</source> - <translation>Sie versuchen, eine schreibgeschützte Datei zu ändern. Bitte speichern Sie sie zuerst in eine andere Datei.</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="907"/> - <source>Languages</source> - <translation>Sprachen</translation> + <source>Undo</source> + <translation>Rückgängig</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="664"/> + <source>Redo</source> + <translation>Wiederherstellen</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="671"/> + <source>Cut</source> + <translation>Ausschneiden</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="674"/> + <source>Copy</source> + <translation>Kopieren</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="677"/> + <source>Paste</source> + <translation>Einfügen</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="682"/> + <source>Indent</source> + <translation>Einrücken</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="685"/> + <source>Unindent</source> + <translation>Einrücken rückgängig</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="688"/> + <source>Comment</source> + <translation>Kommentar</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="691"/> + <source>Uncomment</source> + <translation>Kommentar entfernen</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="771"/> + <source>Close</source> + <translation>Schließen</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="777"/> + <source>Save</source> + <translation>Speichern</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="780"/> + <source>Save As...</source> + <translation>Speichern unter...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="703"/> + <source>Select all</source> + <translation>Alles auswählen</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="704"/> + <source>Deselect all</source> + <translation>Auswahl aufheben</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="701"/> + <source>Select to brace</source> + <translation>Zur Klammer auswählen</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="796"/> + <source>Print</source> + <translation>Drucken</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2448"/> + <source>Printing...</source> + <translation>Drucke...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2465"/> + <source>Printing completed</source> + <translation>Drucken beendet</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2467"/> + <source>Error while printing</source> + <translation>Fehler beim Drucken</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2470"/> + <source>Printing aborted</source> + <translation>Drucken abgebrochen</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6472"/> + <source>File changed</source> + <translation>Datei geändert</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="840"/> + <source>Check</source> + <translation>Prüfen</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2828"/> + <source>File Modified</source> + <translation>Datei geändert</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="862"/> + <source>Code metrics...</source> + <translation>Quelltextmetriken...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="863"/> + <source>Code coverage...</source> + <translation>Quelltext Abdeckung...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="871"/> + <source>Profile data...</source> + <translation>Profildaten...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="860"/> + <source>Show</source> + <translation>Zeige</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="694"/> + <source>Stream Comment</source> + <translation>Stream Kommentar</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="697"/> + <source>Box Comment</source> + <translation>Box Kommentar</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1757"/> + <source>Modification of Read Only file</source> + <translation>Änderungsversuch für eine schreibgeschützte Datei</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1757"/> + <source>You are attempting to change a read only file. Please save to a different file first.</source> + <translation>Sie versuchen, eine schreibgeschützte Datei zu ändern. Bitte speichern Sie sie zuerst in eine andere Datei.</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="910"/> + <source>Languages</source> + <translation>Sprachen</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="667"/> <source>Revert to last saved state</source> <translation>Zurück zum letzten gesichert Zustand</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6184"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Macro Name</source> <translation>Makro Name</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6184"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Select a macro name:</source> <translation>Wähle einen Makro Namen:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6255"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Macro files (*.macro)</source> <translation>Makrodateien (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6212"/> + <location filename="../QScintilla/Editor.py" line="6219"/> <source>Load macro file</source> <translation>Lade Makrodatei</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6235"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source>Error loading macro</source> <translation>Fehler beim Makro Laden</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6255"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Save macro file</source> <translation>Makrodatei schreiben</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6272"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source>Save macro</source> <translation>Makro speichern</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6288"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source>Error saving macro</source> <translation>Fehler beim Makro speichern</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6301"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Start Macro Recording</source> <translation>Makroaufzeichnung starten</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6327"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Macro Recording</source> <translation>Makroaufzeichnung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6327"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Enter name of the macro:</source> <translation>Gib einen Namen für das Makro ein:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1153"/> + <location filename="../QScintilla/Editor.py" line="1156"/> <source>Toggle bookmark</source> <translation>Lesezeichen setzen/löschen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1155"/> + <location filename="../QScintilla/Editor.py" line="1158"/> <source>Next bookmark</source> <translation>Nächstes Lesezeichen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1157"/> + <location filename="../QScintilla/Editor.py" line="1160"/> <source>Previous bookmark</source> <translation>Vorheriges Lesezeichen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1159"/> + <location filename="../QScintilla/Editor.py" line="1162"/> <source>Clear all bookmarks</source> <translation>Alle Lesezeichen löschen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1179"/> + <location filename="../QScintilla/Editor.py" line="1182"/> <source>Toggle breakpoint</source> <translation>Haltepunkt setzen/löschen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1213"/> + <location filename="../QScintilla/Editor.py" line="1216"/> <source>LMB toggles bookmarks</source> <translation>LMK schaltet Lesezeichen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1217"/> + <location filename="../QScintilla/Editor.py" line="1220"/> <source>LMB toggles breakpoints</source> <translation>LMK schaltet Haltepunkte</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1189"/> + <location filename="../QScintilla/Editor.py" line="1192"/> <source>Next breakpoint</source> <translation>Nächster Haltepunkt</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1191"/> + <location filename="../QScintilla/Editor.py" line="1194"/> <source>Previous breakpoint</source> <translation>Vorheriger Haltepunkt</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1193"/> + <location filename="../QScintilla/Editor.py" line="1196"/> <source>Clear all breakpoints</source> <translation>Alle Haltepunkte löschen</translation> </message> <message> + <location filename="../QScintilla/Editor.py" line="1187"/> + <source>Edit breakpoint...</source> + <translation>Haltepunkt bearbeiten...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5161"/> + <source>Enable breakpoint</source> + <translation>Haltepunkt aktivieren</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5164"/> + <source>Disable breakpoint</source> + <translation>Haltepunkt deaktivieren</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5538"/> + <source>Code Coverage</source> + <translation>Quelltext Abdeckung</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5538"/> + <source>Please select a coverage file</source> + <translation>Bitte wählen Sie eine Datei mit Abdeckungsdaten</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5716"/> + <source>Profile Data</source> + <translation>Profildaten</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5716"/> + <source>Please select a profile file</source> + <translation>Bitte wählen Sie eine Datei mit Profildaten</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="4434"/> + <source>Autocompletion</source> + <translation>Automatische Vervollständigung</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="4434"/> + <source>Autocompletion is not available because there is no autocompletion source set.</source> + <translation>Die automatische Vervollständigung ist nicht verfügbar, da keine Quelle gesetzt ist.</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="725"/> + <source>Use Monospaced Font</source> + <translation>Benutze Monospace Font</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="718"/> + <source>Shorten empty lines</source> + <translation>Leere Zeilen verkürzen</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1165"/> + <source>Goto syntax error</source> + <translation>Zu Syntaxfehler gehen</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1169"/> + <source>Clear syntax error</source> + <translation>Syntaxfehler löschen</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="730"/> + <source>Autosave enabled</source> + <translation>Autom. Speicherung aktiv</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6776"/> + <source>Drop Error</source> + <translation>Drop Fehler</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1167"/> + <source>Show syntax error message</source> + <translation>Zeige Syntaxfehlermeldung</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5876"/> + <source>Syntax Error</source> + <translation>Syntaxfehler</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5876"/> + <source>No syntax error message available.</source> + <translation>Keine Syntaxfehlermeldung verfügbar.</translation> + </message> + <message> <location filename="../QScintilla/Editor.py" line="1184"/> - <source>Edit breakpoint...</source> - <translation>Haltepunkt bearbeiten...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5154"/> - <source>Enable breakpoint</source> - <translation>Haltepunkt aktivieren</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5157"/> - <source>Disable breakpoint</source> - <translation>Haltepunkt deaktivieren</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5531"/> - <source>Code Coverage</source> - <translation>Quelltext Abdeckung</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5531"/> - <source>Please select a coverage file</source> - <translation>Bitte wählen Sie eine Datei mit Abdeckungsdaten</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5709"/> - <source>Profile Data</source> - <translation>Profildaten</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5709"/> - <source>Please select a profile file</source> - <translation>Bitte wählen Sie eine Datei mit Profildaten</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="4427"/> - <source>Autocompletion</source> - <translation>Automatische Vervollständigung</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="4427"/> - <source>Autocompletion is not available because there is no autocompletion source set.</source> - <translation>Die automatische Vervollständigung ist nicht verfügbar, da keine Quelle gesetzt ist.</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="722"/> - <source>Use Monospaced Font</source> - <translation>Benutze Monospace Font</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="715"/> - <source>Shorten empty lines</source> - <translation>Leere Zeilen verkürzen</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1162"/> - <source>Goto syntax error</source> - <translation>Zu Syntaxfehler gehen</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1166"/> - <source>Clear syntax error</source> - <translation>Syntaxfehler löschen</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="727"/> - <source>Autosave enabled</source> - <translation>Autom. Speicherung aktiv</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6769"/> - <source>Drop Error</source> - <translation>Drop Fehler</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1164"/> - <source>Show syntax error message</source> - <translation>Zeige Syntaxfehlermeldung</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5869"/> - <source>Syntax Error</source> - <translation>Syntaxfehler</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5869"/> - <source>No syntax error message available.</source> - <translation>Keine Syntaxfehlermeldung verfügbar.</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1181"/> <source>Toggle temporary breakpoint</source> <translation>Temporären Haltepunkt setzen/löschen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="862"/> - <source>Show code coverage annotations</source> - <translation>Markiere Zeilen ohne Abdeckung</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="865"/> + <source>Show code coverage annotations</source> + <translation>Markiere Zeilen ohne Abdeckung</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="868"/> <source>Hide code coverage annotations</source> <translation>Lösche Abdeckungsmarkierungen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1196"/> - <source>Next uncovered line</source> - <translation>Nächste nichtabgedeckte Zeile</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1199"/> + <source>Next uncovered line</source> + <translation>Nächste nichtabgedeckte Zeile</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1202"/> <source>Previous uncovered line</source> <translation>Vorige nichtabgedeckte Zeile</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5594"/> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>Show Code Coverage Annotations</source> <translation>Zeilen ohne Abdeckung Markieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5587"/> - <source>All lines have been covered.</source> - <translation>Alle Zeilen sind abgedeckt.</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="5594"/> + <source>All lines have been covered.</source> + <translation>Alle Zeilen sind abgedeckt.</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>There is no coverage file available.</source> <translation>Es gibt keine Datei mit Abdeckungsinformationen.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2823"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>Die Datei <b>{0}</b> enthält ungesicherte Änderungen.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6226"/> + <location filename="../QScintilla/Editor.py" line="6233"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Die Makrodatei <b>{0}</b> kann nicht gelesen werden.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6235"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Die Makrodatei <b>{0}</b> ist zerstört.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6288"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>Die Makrodatei <b>{0}</b> kann nicht geschrieben werden.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6769"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> ist keine Datei.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="340"/> + <location filename="../QScintilla/Editor.py" line="343"/> <source><p>The size of the file <b>{0}</b> is <b>{1} KB</b>. Do you really want to load it?</p></source> <translation><p>Die Größe der Datei <b>{0}</b> ist <b>{1} KB<7B>. Soll sie wirklich geladen werden?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="881"/> + <location filename="../QScintilla/Editor.py" line="884"/> <source>Diagrams</source> <translation>Diagramme</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="883"/> + <location filename="../QScintilla/Editor.py" line="886"/> <source>Class Diagram...</source> <translation>Klassendiagramm...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="885"/> + <location filename="../QScintilla/Editor.py" line="888"/> <source>Package Diagram...</source> <translation>Package Diagramm...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="887"/> + <location filename="../QScintilla/Editor.py" line="890"/> <source>Imports Diagram...</source> <translation>Imports-Diagramm...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="889"/> + <location filename="../QScintilla/Editor.py" line="892"/> <source>Application Diagram...</source> <translation>Applikations-Diagramm...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="910"/> + <location filename="../QScintilla/Editor.py" line="913"/> <source>No Language</source> <translation>Keine Sprache</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6629"/> + <location filename="../QScintilla/Editor.py" line="6636"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6790"/> + <location filename="../QScintilla/Editor.py" line="6797"/> <source>Resources</source> <translation>Ressourcen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6792"/> - <source>Add file...</source> - <translation>Datei hinzufügen...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6794"/> - <source>Add files...</source> - <translation>Dateien hinzufügen...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6796"/> - <source>Add aliased file...</source> - <translation>Aliased-Datei hinzufügen...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6799"/> - <source>Add localized resource...</source> - <translation>Lokalisierte Ressource hinzufügen...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6822"/> - <source>Add file resource</source> - <translation>Dateiressource hinzufügen</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6838"/> - <source>Add file resources</source> - <translation>Dateiressourcen hinzufügen</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6866"/> - <source>Add aliased file resource</source> - <translation>Aliased-Dateiressourcen hinzufügen</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6866"/> - <source>Alias for file <b>{0}</b>:</source> - <translation>Alias für Datei <b>{0}</b>:</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6930"/> - <source>Package Diagram</source> - <translation>Package-Diagramm</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6930"/> - <source>Include class attributes?</source> - <translation>Klassenattribute anzeigen?</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6964"/> - <source>Application Diagram</source> - <translation>Applikations-Diagramm</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6964"/> - <source>Include module names?</source> - <translation>Modulnamen anzeigen?</translation> + <source>Add file...</source> + <translation>Datei hinzufügen...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6801"/> + <source>Add files...</source> + <translation>Dateien hinzufügen...</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="6803"/> + <source>Add aliased file...</source> + <translation>Aliased-Datei hinzufügen...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6806"/> + <source>Add localized resource...</source> + <translation>Lokalisierte Ressource hinzufügen...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6829"/> + <source>Add file resource</source> + <translation>Dateiressource hinzufügen</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6845"/> + <source>Add file resources</source> + <translation>Dateiressourcen hinzufügen</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6873"/> + <source>Add aliased file resource</source> + <translation>Aliased-Dateiressourcen hinzufügen</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6873"/> + <source>Alias for file <b>{0}</b>:</source> + <translation>Alias für Datei <b>{0}</b>:</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6937"/> + <source>Package Diagram</source> + <translation>Package-Diagramm</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6937"/> + <source>Include class attributes?</source> + <translation>Klassenattribute anzeigen?</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6971"/> + <source>Application Diagram</source> + <translation>Applikations-Diagramm</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6971"/> + <source>Include module names?</source> + <translation>Modulnamen anzeigen?</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6810"/> <source>Add resource frame</source> <translation>Ressourcenrahmen hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6301"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Macro recording is already active. Start new?</source> <translation>Eine Makroaufzeichnung ist bereits aktiv. Neu starten?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1202"/> + <location filename="../QScintilla/Editor.py" line="1205"/> <source>Next task</source> <translation>Nächste Aufgabe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1204"/> + <location filename="../QScintilla/Editor.py" line="1207"/> <source>Previous task</source> <translation>Vorherige Aufgabe</translation> </message> <message> + <location filename="../QScintilla/Editor.py" line="822"/> + <source>Complete from Document</source> + <translation>Vervollständigung vom Dokument</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="824"/> + <source>Complete from APIs</source> + <translation>Vervollständigung von APIs</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="826"/> + <source>Complete from Document and APIs</source> + <translation>Vervollständigung vom Dokument und von APIs</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1033"/> + <source>Export as</source> + <translation>Exportieren als</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1256"/> + <source>Export source</source> + <translation>Quelltext exportieren</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1248"/> + <source><p>No exporter available for the export format <b>{0}</b>. Aborting...</p></source> + <translation><p>Für das Exportformat <b>{0}</b> steht kein Exporter zur Verfügung. Abbruch...</p></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1256"/> + <source>No export format given. Aborting...</source> + <translation>Kein Exportformat angegeben. Abbruch...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6957"/> + <source>Imports Diagram</source> + <translation>Imports Diagramm</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6957"/> + <source>Include imports from external modules?</source> + <translation>Imports externer Module anzeigen?</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="749"/> + <source>Calltip</source> + <translation>Calltip</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="793"/> + <source>Print Preview</source> + <translation>Druckvorschau</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="403"/> + <source><b>A Source Editor Window</b><p>This window is used to display and edit a source file. You can open as many of these as you like. The name of the file is displayed in the window's titlebar.</p><p>In order to set breakpoints just click in the space between the line numbers and the fold markers. Via the context menu of the margins they may be edited.</p><p>In order to set bookmarks just Shift click in the space between the line numbers and the fold markers.</p><p>These actions can be reversed via the context menu.</p><p>Ctrl clicking on a syntax error marker shows some info about this error.</p></source> + <translation><b>Quelltexteditorfenster</b><p>Dieses Fenster wird zum Bearbeiten von Quelltexten benutzt. Sie können beliebig viele dieser Fenster öffnen. Der Name der Datei wird im Titel des Fensters dargestellt.</p><p>Um Haltepunkte zu setzen, klicken sie in den Raum zwischen den Zeilennummern und der Faltungsspalte. Über das Kontextmenü des Bereiches links des Editors können Haltepunkte bearbeitet werden.</p><p>Um Lesezeichen zu setzen, drücken Sie die Shift-Taste und klicken in den Raum zwischen den Zeilennummern und der Faltungsspalte.</p><p>Diese Aktionen können über das Kontextmenü umgedreht werden.</p><p>Ein Klick auf einen Syntaxfehler-Marker mit gedrückter Strg-Taste zeigt die zugehörige Fehlermeldung an.</p></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="734"/> + <source>Typing aids enabled</source> + <translation>Eingabehilfen aktiv</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="997"/> + <source>End-of-Line Type</source> + <translation>Zeilenendemarkierung</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1001"/> + <source>Unix</source> + <translation>Unix</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1008"/> + <source>Windows</source> + <translation>Windows</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1015"/> + <source>Macintosh</source> + <translation>Macintosh</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="956"/> + <source>Encodings</source> + <translation>Kodierungen</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="936"/> + <source>Guessed</source> + <translation>Ermittelt</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1271"/> + <source>Alternatives</source> + <translation>Alternativen</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1267"/> + <source>Alternatives ({0})</source> + <translation>Alternativen ({0})</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1287"/> + <source>Pygments Lexer</source> + <translation>Pygments Lexer</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1287"/> + <source>Select the Pygments lexer to apply.</source> + <translation>Wähle den anzuwendenden Pygments Lexer.</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7249"/> + <source>Check spelling...</source> + <translation>Rechtschreibprüfung...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="710"/> + <source>Check spelling of selection...</source> + <translation>Rechtschreibprüfung für Auswahl...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7252"/> + <source>Add to dictionary</source> + <translation>Zum Wörterbuch hinzufügen</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7254"/> + <source>Ignore All</source> + <translation>Alle ignorieren</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="714"/> + <source>Remove from dictionary</source> + <translation>Aus dem Wörterbuch entfernen</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2883"/> + <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> + <translation><p>Die Datei <b>{0}</b> konnte nicht geöffnet werden.<br />Ursache: {1}</p></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2987"/> + <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> + <translation><p>Die Datei <b>{0}</b> konnte nicht gesichert werden.<br/>Grund: {1}</p></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1172"/> + <source>Next warning</source> + <translation>Nächste Warnung</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1175"/> + <source>Previous warning</source> + <translation>Vorherige Warnung</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1177"/> + <source>Show warning message</source> + <translation>Zeige Warnung</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1179"/> + <source>Clear warnings</source> + <translation>Warnungen löschen</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="3046"/> + <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6279"/> + <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>Die Makrodatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6130"/> + <source>Warning: {0}</source> + <translation>Warnung: {0}</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6137"/> + <source>Error: {0}</source> + <translation>Fehler: {0}</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6468"/> + <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> + <translation><br><b>Warnung:</b> Vorgenommenen Änderungen gehen beim neu einlesen verloren.</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="4539"/> + <source>Activating Auto-Completion Provider</source> + <translation>Aktivierung eines Providers für automatische Vervollständigungen</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="4539"/> + <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> + <translation>Ein Provider für automatische Vervollständigungen kann nicht angebunden werden, da bereits ein anderer aktiv ist. Bitte überprüfen Sie Ihre Konfiguration.</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="4859"/> + <source>Activating Calltip Provider</source> + <translation>Aktivierung eines Providers für Calltips</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="4859"/> + <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> + <translation>Ein Provider für Calltips kann nicht angebunden werden, da bereits ein anderer aktiv ist. Bitte überprüfen Sie Ihre Konfiguration.</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="789"/> + <source>Open 'rejection' file</source> + <translation>Öffne „Ablehnungs“-Datei</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="896"/> + <source>Load Diagram...</source> + <translation>Diagramm laden...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1210"/> + <source>Next change</source> + <translation>Nächste Änderung</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1213"/> + <source>Previous change</source> + <translation>Vorherige Änderung</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7666"/> + <source>Sort Lines</source> + <translation>Zeilen sortieren</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7666"/> + <source>The selection contains illegal data for a numerical sort.</source> + <translation>Die Auswahl enthält für eine numerische Sortierung ungültige Daten.</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6066"/> + <source>Warning</source> + <translation>Warnung</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6066"/> + <source>No warning messages available.</source> + <translation>Keine Warnmeldungen verfügbar.</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6127"/> + <source>Style: {0}</source> + <translation>Stil: {0}</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="763"/> + <source>New Document View</source> + <translation>Neue Dokumentenansicht</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="766"/> + <source>New Document View (with new split)</source> + <translation>Neue Dokumentenansicht (in neuem Abschnitt)</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="850"/> + <source>Tools</source> + <translation>Werkzeuge</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="978"/> + <source>Re-Open With Encoding</source> + <translation>Öffnen mit Kodierung</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6462"/> + <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> + <translation><p>Die Datei <b>{0}</b> wurde geändert, während sie in eric6 geöffnet war. Neu einlesen?</p></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="741"/> + <source>Automatic Completion enabled</source> + <translation>Automatische Vervollständigung aktiv</translation> + </message> + <message> <location filename="../QScintilla/Editor.py" line="819"/> - <source>Complete from Document</source> - <translation>Vervollständigung vom Dokument</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="821"/> - <source>Complete from APIs</source> - <translation>Vervollständigung von APIs</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="823"/> - <source>Complete from Document and APIs</source> - <translation>Vervollständigung vom Dokument und von APIs</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1030"/> - <source>Export as</source> - <translation>Exportieren als</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1253"/> - <source>Export source</source> - <translation>Quelltext exportieren</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1245"/> - <source><p>No exporter available for the export format <b>{0}</b>. Aborting...</p></source> - <translation><p>Für das Exportformat <b>{0}</b> steht kein Exporter zur Verfügung. Abbruch...</p></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1253"/> - <source>No export format given. Aborting...</source> - <translation>Kein Exportformat angegeben. Abbruch...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6950"/> - <source>Imports Diagram</source> - <translation>Imports Diagramm</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6950"/> - <source>Include imports from external modules?</source> - <translation>Imports externer Module anzeigen?</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="746"/> - <source>Calltip</source> - <translation>Calltip</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="790"/> - <source>Print Preview</source> - <translation>Druckvorschau</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="400"/> - <source><b>A Source Editor Window</b><p>This window is used to display and edit a source file. You can open as many of these as you like. The name of the file is displayed in the window's titlebar.</p><p>In order to set breakpoints just click in the space between the line numbers and the fold markers. Via the context menu of the margins they may be edited.</p><p>In order to set bookmarks just Shift click in the space between the line numbers and the fold markers.</p><p>These actions can be reversed via the context menu.</p><p>Ctrl clicking on a syntax error marker shows some info about this error.</p></source> - <translation><b>Quelltexteditorfenster</b><p>Dieses Fenster wird zum Bearbeiten von Quelltexten benutzt. Sie können beliebig viele dieser Fenster öffnen. Der Name der Datei wird im Titel des Fensters dargestellt.</p><p>Um Haltepunkte zu setzen, klicken sie in den Raum zwischen den Zeilennummern und der Faltungsspalte. Über das Kontextmenü des Bereiches links des Editors können Haltepunkte bearbeitet werden.</p><p>Um Lesezeichen zu setzen, drücken Sie die Shift-Taste und klicken in den Raum zwischen den Zeilennummern und der Faltungsspalte.</p><p>Diese Aktionen können über das Kontextmenü umgedreht werden.</p><p>Ein Klick auf einen Syntaxfehler-Marker mit gedrückter Strg-Taste zeigt die zugehörige Fehlermeldung an.</p></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="731"/> - <source>Typing aids enabled</source> - <translation>Eingabehilfen aktiv</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="994"/> - <source>End-of-Line Type</source> - <translation>Zeilenendemarkierung</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="998"/> - <source>Unix</source> - <translation>Unix</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1005"/> - <source>Windows</source> - <translation>Windows</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1012"/> - <source>Macintosh</source> - <translation>Macintosh</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="953"/> - <source>Encodings</source> - <translation>Kodierungen</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="933"/> - <source>Guessed</source> - <translation>Ermittelt</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1268"/> - <source>Alternatives</source> - <translation>Alternativen</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1264"/> - <source>Alternatives ({0})</source> - <translation>Alternativen ({0})</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1284"/> - <source>Pygments Lexer</source> - <translation>Pygments Lexer</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1284"/> - <source>Select the Pygments lexer to apply.</source> - <translation>Wähle den anzuwendenden Pygments Lexer.</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="7242"/> - <source>Check spelling...</source> - <translation>Rechtschreibprüfung...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="707"/> - <source>Check spelling of selection...</source> - <translation>Rechtschreibprüfung für Auswahl...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="7245"/> - <source>Add to dictionary</source> - <translation>Zum Wörterbuch hinzufügen</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="7247"/> - <source>Ignore All</source> - <translation>Alle ignorieren</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="711"/> - <source>Remove from dictionary</source> - <translation>Aus dem Wörterbuch entfernen</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2878"/> - <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> - <translation><p>Die Datei <b>{0}</b> konnte nicht geöffnet werden.<br />Ursache: {1}</p></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2982"/> - <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> - <translation><p>Die Datei <b>{0}</b> konnte nicht gesichert werden.<br/>Grund: {1}</p></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1169"/> - <source>Next warning</source> - <translation>Nächste Warnung</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1172"/> - <source>Previous warning</source> - <translation>Vorherige Warnung</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1174"/> - <source>Show warning message</source> - <translation>Zeige Warnung</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1176"/> - <source>Clear warnings</source> - <translation>Warnungen löschen</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="3041"/> - <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6272"/> - <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation><p>Die Makrodatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6123"/> - <source>Warning: {0}</source> - <translation>Warnung: {0}</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6130"/> - <source>Error: {0}</source> - <translation>Fehler: {0}</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6461"/> - <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> - <translation><br><b>Warnung:</b> Vorgenommenen Änderungen gehen beim neu einlesen verloren.</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="4532"/> - <source>Activating Auto-Completion Provider</source> - <translation>Aktivierung eines Providers für automatische Vervollständigungen</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="4532"/> - <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> - <translation>Ein Provider für automatische Vervollständigungen kann nicht angebunden werden, da bereits ein anderer aktiv ist. Bitte überprüfen Sie Ihre Konfiguration.</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="4852"/> - <source>Activating Calltip Provider</source> - <translation>Aktivierung eines Providers für Calltips</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="4852"/> - <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> - <translation>Ein Provider für Calltips kann nicht angebunden werden, da bereits ein anderer aktiv ist. Bitte überprüfen Sie Ihre Konfiguration.</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="786"/> - <source>Open 'rejection' file</source> - <translation>Öffne „Ablehnungs“-Datei</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="893"/> - <source>Load Diagram...</source> - <translation>Diagramm laden...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1207"/> - <source>Next change</source> - <translation>Nächste Änderung</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1210"/> - <source>Previous change</source> - <translation>Vorherige Änderung</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="7659"/> - <source>Sort Lines</source> - <translation>Zeilen sortieren</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="7659"/> - <source>The selection contains illegal data for a numerical sort.</source> - <translation>Die Auswahl enthält für eine numerische Sortierung ungültige Daten.</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6059"/> - <source>Warning</source> - <translation>Warnung</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6059"/> - <source>No warning messages available.</source> - <translation>Keine Warnmeldungen verfügbar.</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6120"/> - <source>Style: {0}</source> - <translation>Stil: {0}</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="760"/> - <source>New Document View</source> - <translation>Neue Dokumentenansicht</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="763"/> - <source>New Document View (with new split)</source> - <translation>Neue Dokumentenansicht (in neuem Abschnitt)</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="847"/> - <source>Tools</source> - <translation>Werkzeuge</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="975"/> - <source>Re-Open With Encoding</source> - <translation>Öffnen mit Kodierung</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6455"/> - <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> - <translation><p>Die Datei <b>{0}</b> wurde geändert, während sie in eric6 geöffnet war. Neu einlesen?</p></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="738"/> - <source>Automatic Completion enabled</source> - <translation>Automatische Vervollständigung aktiv</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="816"/> <source>Complete</source> <translation>Vervollständigen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4581"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>Auto-Completion Provider</source> <translation>Provider für automatische Vervollständigungen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4581"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>Der Provider für automatische Vervollständigungen namens '{0}' ist bereits registriert. Die Wiederholung wird ignoriert.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>Call-Tips Provider</source> <translation>Calltipps-Provider</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>Der Calltipps-Provider namens '{0}' ist bereits registriert. Die Wiederholung wird ignoriert.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7746"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>Register Mouse Click Handler</source> <translation>Maus Klick Handler registrieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7746"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation>Ein Maus Klick Handler für "{0}" wurde bereits durch "{1}" registriert. Die Anfrage durch "{2}" wird abgebrochen...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="780"/> + <location filename="../QScintilla/Editor.py" line="783"/> <source>Save Copy...</source> <translation>Kopie speichern...</translation> </message> @@ -9953,7 +9952,7 @@ <translation>Drücken, um eine API-Datei aus der Liste installierter API-Dateien zu wählen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> <source>Add from installed APIs</source> <translation>Von installierten APIs hinzufügen</translation> </message> @@ -9963,17 +9962,17 @@ <translation>Drücke, um die gewählte APIs Zusammenstellung zu übersetzen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="299"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="301"/> <source>Compile APIs</source> <translation>APIs übersetzen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="238"/> <source>Select from the list of installed API files</source> <translation>Wähle aus der Liste installierter API-Dateien</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="314"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="316"/> <source>Cancel compilation</source> <translation>Übersetzung abbrechen</translation> </message> @@ -9988,17 +9987,17 @@ <translation>Drücken, um eine API-Datei aus der Liste von API-Dateien, die von Plugins installierter wurden, zu wählen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> <source>Add from Plugin APIs</source> <translation>Von Plugin APIs hinzufügen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> <source>Select from the list of API files installed by plugins</source> <translation>Wähle aus der Liste von API-Dateien, die von Plugins installierter wurden</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> <source>There are no APIs installed yet. Selection is not available.</source> <translation>Es sind noch keine APIs installiert. Die Auswahl ist nicht verfügbar.</translation> </message> @@ -10165,6 +10164,89 @@ </message> </context> <context> + <name>EditorButtonsWidget</name> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="175"/> + <source>Bold</source> + <translation>Fett</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="177"/> + <source>Italic</source> + <translation>Kursiv</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="179"/> + <source>Strike Through</source> + <translation>Durchgestrichen</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="182"/> + <source>Header 1</source> + <translation>Überschrift 1</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="184"/> + <source>Header 2</source> + <translation>Überschrift 2</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="186"/> + <source>Header 3</source> + <translation>Überschrift 3</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="188"/> + <source>Header</source> + <translation>Überschrift</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="193"/> + <source>Inline Code</source> + <translation>Code-Bereich</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="195"/> + <source>Code Block</source> + <translation>Code Block</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="197"/> + <source>Quote</source> + <translation>Zitat</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="200"/> + <source>Add Hyperlink</source> + <translation>Hyperlink hinzufügen</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="202"/> + <source>Add Horizontal Line</source> + <translation>Horizontale Linie hinzufügen</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="204"/> + <source>Add Image</source> + <translation>Grafik hinzufügen</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="207"/> + <source>Add Bulleted List</source> + <translation>Aufzählungsliste hinzufügen</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="209"/> + <source>Add Numbered List</source> + <translation>Nummerierte Liste hinzufügen</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="273"/> + <source>Level {0}</source> + <translation>Ebene {0}</translation> + </message> +</context> +<context> <name>EditorCalltipsPage</name> <message> <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="37"/> @@ -10974,7 +11056,7 @@ <translation>Wähle den zuzuordnenden alternativen Lexer</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightersPage.py" line="142"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightersPage.py" line="146"/> <source>Alternative</source> <translation>Alternative</translation> </message> @@ -11002,7 +11084,7 @@ <translation>Wähle den Modus „Füllen bis zum Zeilenende“.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> <source>Fill to end of line</source> <translation>Füllen bis zum Zeilenende</translation> </message> @@ -11077,17 +11159,17 @@ <translation>Alle Füllen bis Ende</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="351"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="355"/> <source>Enabled</source> <translation>Eingeschaltet</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="352"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="356"/> <source>Disabled</source> <translation>Ausgeschaltet</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> <source>Select fill to end of line for all styles</source> <translation>Wähle Füllen bis Zeilenende für alle Stile</translation> </message> @@ -11147,27 +11229,27 @@ <translation>Alle Stile exportieren</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465"/> <source>Export Highlighting Styles</source> <translation>Hervorhebungsstile exportieren</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465"/> <source><p>The highlighting styles could not be exported to file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Die Hervorhebungsstile konnten nicht in die Datei <b>{0}</b> exportiert werden.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="497"/> <source>Import Highlighting Styles</source> <translation>Hervorhebungsstile importieren</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="497"/> <source><p>The highlighting styles could not be read from file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Die Hervorhebungsstile konnten nicht von der Datei <b>{0}</b> gelesen werden.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="477"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="481"/> <source>Highlighting styles file (*.e4h)</source> <translation>Dateien für Hervorhebungsstile (*.e4h)</translation> </message> @@ -11294,12 +11376,12 @@ <translation>Bash-Lexereinstellungen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1048"/> <source>Select whether folding of comments shall be possible</source> <translation>Wähle aus, ob die Faltung von Kommentaren möglich sein soll</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1051"/> <source>Fold comments</source> <translation>Kommentare falten</translation> </message> @@ -11329,22 +11411,22 @@ <translation>Öffnende geschweifte Klammer einrücken</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="990"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/> <source>Select whether folding at else statement should be possible</source> <translation>Wähle aus, ob die Faltung bei Else möglich sein soll</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/> <source>Fold at else</source> <translation>Bei Else falten</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="522"/> <source>Select whether folding of preprocessor directives shall be possible</source> <translation>Wähle aus, ob die Faltung von Präprozessoranweisungen möglich sein soll</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="525"/> <source>Fold preprocessor directives</source> <translation>Falte Preprozessoranweisungen</translation> </message> @@ -11389,127 +11471,127 @@ <translation>Schreibweise der Tags beachten</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="516"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/> <source>Perl Lexer Properties</source> <translation>Perl-Lexereinstellungen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="637"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/> <source>Povray Lexer Properties</source> <translation>Povray-Lexereinstellungen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="643"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/> <source>Select whether folding of directives shall be possible</source> <translation>Wähle aus, ob die Faltung von Direktiven möglich sein soll</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="646"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/> <source>Fold directives</source> <translation>Direktiven falten</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="685"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> <source>Python Lexer Properties</source> <translation>Python-Lexereinstellungen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="796"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="825"/> <source>Select whether bad indentation shall be highlighted</source> <translation>Wähle aus, ob fehlerhafte Einrückungen hervorgehoben werden sollen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="721"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="750"/> <source>Select whether text should be autoindented after a ':'</source> <translation>Wähle aus, ob Text nach einem „:“ automatisch eingerückt werden soll</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="724"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="753"/> <source>Auto indentation after ':'</source> <translation>Automatische Einrückung nach „:“</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="730"/> <source>Select whether folding of strings shall be possible</source> <translation>Wähle aus, ob die Faltung von Zeichenketten möglich sein soll</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="733"/> <source>Fold strings</source> <translation>Zeichenketten falten</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="827"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/> <source>SQL Lexer Properties</source> <translation>SQL-Lexereinstellungen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="863"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="892"/> <source>Select to enable Backslash Escapes</source> <translation>Auswählen, um „Backslash-Escapes“ zu aktivieren</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="866"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="895"/> <source>Backslash Escapes</source> <translation>Backslash-Escapes</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="964"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/> <source>VHDL Lexer Properties</source> <translation>VHDL-Lexereinstellungen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="999"/> <source>Select whether folding of blocks at a parenthesis shall be possible</source> <translation>Wähle aus, ob die Faltung von Blöcken an einer Klammer möglich sein soll</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1002"/> <source>Fold at parenthesis</source> <translation>Bei Klammer falten</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1009"/> <source>Select whether folding of begin blocks shall be possible</source> <translation>Wähle aus, ob die Faltung von Begin-Blöcken möglich sein soll</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1012"/> <source>Fold at begin</source> <translation>Bei Begin falten</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/> <source>Pascal Lexer Properties</source> <translation>Pascal-Lexereinstellungen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="565"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="594"/> <source>PostScript Lexer Properties</source> <translation>PostScript-Lexereinstellungen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="581"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="610"/> <source>Select to mark tokens</source> <translation>Auswählen, um Tokens zu markieren</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="584"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="613"/> <source>Mark Tokens</source> <translation>Tokens markieren</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="593"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="622"/> <source>PostScript Level:</source> <translation>PostScript-Level:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="600"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="629"/> <source>Select the PostScript level</source> <translation>Wähle das PostScript-Level aus</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1013"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1042"/> <source>YAML Lexer Properties</source> <translation>YAML-Lexereinstellungen</translation> </message> @@ -11559,62 +11641,62 @@ <translation>Skripts einfärben</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="503"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/> <source>Select to enable smart highlighting of keywords</source> <translation>Auswählen, um Smart-Highlighting von Schlüsselwörtern zu aktivieren</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/> - <source>Smart Highlighting</source> - <translation>Smart-Highlighting</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/> - <source>Select to enable folding of Perl packages</source> - <translation>Auswählen, um Perl-Pakete zu falten</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="535"/> + <source>Smart Highlighting</source> + <translation>Smart-Highlighting</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="561"/> + <source>Select to enable folding of Perl packages</source> + <translation>Auswählen, um Perl-Pakete zu falten</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="564"/> <source>Fold packages</source> <translation>Pakete falten</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="542"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="571"/> <source>Select to enable folding of Perl POD blocks</source> <translation>Auswählen, um Perl-POD-Blöcke zu falten</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="574"/> <source>Fold POD blocks</source> <translation>POD-Blöcke falten</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="741"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="770"/> <source>Select to allow Python v2 unicode string literals (e.g. u"utf8")</source> <translation>Auswählen, um Python 2-Unicode-Zeichenketten (z.B. u"utf8") zuzulassen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="744"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="773"/> <source>Allow v2 unicode string literals</source> <translation>v2-Unicode-Zeichenketten zulassen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="751"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="780"/> <source>Select to allow Python v3 binary and octal literals (e.g. 0b1011, 0o712)</source> <translation>Auswählen, um Python 3-Binär- und -Oktalzahlen (z.B. 0b1011, 0o712) zuzulassen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="754"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/> <source>Allow v3 binary and octal literals</source> <translation>v3-Binär- und -Oktalzahlen zulassen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="761"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="790"/> <source>Select to allow Python v3 bytes string literals (e.g. b"bytes")</source> <translation>Auswählen, um Python 3-Byte-Zeichenketten (z.B. b"bytes") zulassen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="764"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="793"/> <source>Allow v3 bytes string literals</source> <translation>v3-Bytes-Zeichenketten zulassen</translation> </message> @@ -11649,112 +11731,112 @@ <translation>Aktiviere Mako-Schablonen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="695"/> <source>Properties Lexer Properties</source> <translation>Properties-Lexereinstellungen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/> <source>Select to allow initial spaces in a line</source> <translation>Auswählen, um führende Leerzeichen in einer Zeile zuzulassen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/> <source>Allow initial spaces</source> <translation>führende Leerzeichen zulassen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="740"/> <source>Select whether folding of triple quoted strings shall be possible</source> <translation>Wähle aus, ob die Faltung von Zeichenketten in dreifachen Anführungszeichen möglich sein soll</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="743"/> <source>Fold triple quoted strings</source> <translation>Zeichenketten in dreifachen Anführungszeichen falten</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="760"/> <source>Select to allow strings to span newline characters</source> <translation>Auswählen, wenn Zeichenketten über das Zeilenendezeichen hinausgehen dürfen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="734"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="763"/> <source>Strings may span newline characters</source> <translation>Zeichenketten können Zeilenendezeichen überspannen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="808"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="837"/> <source>Ruby Lexer Properties</source> <translation>Ruby-Lexereinstellungen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="853"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="882"/> <source>Select whether only BEGIN blocks can be folded</source> <translation>Auswählen, wenn nur BEGIN-Blöcke gefaltet werden sollen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="885"/> <source>Only BEGIN blocks can be folded</source> <translation>Faltung nur für BEGIN-Blöcke</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="873"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="902"/> <source>Select if words may contain dots</source> <translation>Auswählen, wenn Worte Punkte enthalten dürfen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="876"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="905"/> <source>Words may contain dots</source> <translation>Worte dürfen Punkte enthalten</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="883"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="912"/> <source>Select to allow '#' as a comment character</source> <translation>Auswählen, um „#“ als Kommentarzeichen zuzulassen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="886"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="915"/> <source>Allow '#' as comment character</source> <translation>„#“ als Kommentarzeichen zulassen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="893"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="922"/> <source>Select to enable quoted identifiers</source> <translation>Auswählen, um Bezeichner in Anführungszeichen zu aktivieren</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="896"/> - <source>Enable quoted identifiers</source> - <translation>Bezeichner in Anführungszeichen zulassen</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="906"/> - <source>TCL Lexer Properties</source> - <translation>TCL-Lexereinstellungen</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="925"/> - <source>TeX Lexer Properties</source> - <translation>TeX-Lexereinstellungen</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="941"/> - <source>Select to treat comments as TeX source</source> - <translation>Auswählen, um Kommentare wie TeX-Quelltext zu behandeln</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="944"/> - <source>Treat comments as TeX source</source> - <translation>Behandle Kommentare als TeX-Quelltext</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="951"/> - <source>Select to treat \if<unknown> as a command</source> - <translation>Auswählen, um \if<unknown> als Kommando zu behandeln</translation> + <source>Enable quoted identifiers</source> + <translation>Bezeichner in Anführungszeichen zulassen</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="935"/> + <source>TCL Lexer Properties</source> + <translation>TCL-Lexereinstellungen</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="954"/> + <source>TeX Lexer Properties</source> + <translation>TeX-Lexereinstellungen</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/> + <source>Select to treat comments as TeX source</source> + <translation>Auswählen, um Kommentare wie TeX-Quelltext zu behandeln</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/> + <source>Treat comments as TeX source</source> + <translation>Behandle Kommentare als TeX-Quelltext</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/> + <source>Select to treat \if<unknown> as a command</source> + <translation>Auswählen, um \if<unknown> als Kommando zu behandeln</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/> <source>Treat \if<unknown> as command</source> <translation>Behandle \if<unknown> als Kommando</translation> </message> @@ -11764,7 +11846,7 @@ <translation>Zeichenketten in dreifachen Anführungszeichen hervorheben</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="774"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="803"/> <source>Highlight sub-identifiers</source> <translation>Unteridentifizierer hervorheben</translation> </message> @@ -11774,7 +11856,7 @@ <translation>Auswählen, um Zeichenketten in dreifachen Anführungszeichen hervorzuheben</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="771"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="800"/> <source>Select to highlight sub-identifiers defined in keyword set 2</source> <translation>Auswählen, um in Schlüsselwortgruppe 2 definierte Unteridentifizierer hervorzuheben</translation> </message> @@ -11829,32 +11911,32 @@ <translation>CoffeeScript</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="812"/> <source>Highlight bad indentation:</source> <translation>Fehlerhafte Einrückung hervorheben:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>No Warning</source> <translation>keine Warnung</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Inconsistent</source> <translation>Inkonsistent</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Tabs after Spaces</source> <translation>Tabulatoren nach Leerzeichen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Spaces</source> <translation>Leerzeichen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Tabs</source> <translation>Tabulatoren</translation> </message> @@ -11874,7 +11956,7 @@ <translation>Auswählen, um Escape-Sequenzen hervorzuheben</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="194"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/> <source>Highlight escape sequences</source> <translation>Escape-Sequenzen hervorheben</translation> </message> @@ -11888,6 +11970,26 @@ <source>Allow verbatim string escape sequences</source> <translation>Escape-Sequenzen in 'wörtlichen' Zeichenketten zulassen</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/> + <source>JSON</source> + <translation>JSON</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="483"/> + <source>Select to enable highlighting of line/block comments</source> + <translation>Auswählen, um die Hervorhebung von Zeilen-/Blockkommentaren zu aktivieren</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="486"/> + <source>Highlight comments</source> + <translation>Kommentare hervorheben</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/> + <source>Select to enable highlighting of escape sequences in strings</source> + <translation>Auswählen, um die Hervorhebung von Escape-Sequenzen zu aktivieren</translation> + </message> </context> <context> <name>EditorSearchPage</name> @@ -12992,6 +13094,16 @@ <source>Select the colour for the search marker</source> <translation>Wähle die Farbe der Suchmarkierung</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1866"/> + <source>Select to hide the Format Buttons bar when formatting is not supported</source> + <translation>Auswählen, um die Formatbuttonsleiste auszublenden, wenn dies nicht unterstützt wird</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1869"/> + <source>Hide Format Buttons bar when not supported</source> + <translation>Formatbuttonsleiste ausblenden, wenn nicht unterstützt</translation> + </message> </context> <context> <name>EditorSyntaxPage</name> @@ -13257,32 +13369,32 @@ <context> <name>EmailDialog</name> <message> - <location filename="../UI/EmailDialog.py" line="339"/> + <location filename="../UI/EmailDialog.py" line="346"/> <source>Send bug report</source> <translation>Sende Fehlerbericht</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="357"/> + <location filename="../UI/EmailDialog.py" line="364"/> <source>Attach file</source> <translation>Datei anhängen</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="339"/> + <location filename="../UI/EmailDialog.py" line="346"/> <source><p>Message could not be sent.<br>Reason: {0}</p></source> <translation><p>Nachricht konnte nicht gesendet werden.<br>Grund: {0}</p></translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="293"/> + <location filename="../UI/EmailDialog.py" line="300"/> <source>Mail Server Password</source> <translation>Mail Server Kennwort</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="293"/> + <location filename="../UI/EmailDialog.py" line="300"/> <source>Enter your mail server password</source> <translation>Geben Sie Ihr Mailserver-Kennwort ein</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="311"/> + <location filename="../UI/EmailDialog.py" line="318"/> <source><p>Authentication failed.<br>Reason: {0}</p></source> <translation><p>Autorisierung fehlgeschlagen.<br>Grund: {0}</p></translation> </message> @@ -13380,17 +13492,17 @@ <context> <name>EmailPage</name> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="183"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="225"/> <source>Enter your password for accessing the mail server</source> <translation>Geben Sie das Kennwort zum Zugriff auf den Mailserver ein</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="211"/> <source>Enter your mail server username</source> <translation>Geben Sie Ihren Mailserver-Nutzernamen ein</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="106"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="170"/> <source>Signature:</source> <translation>Signatur:</translation> </message> @@ -13400,37 +13512,37 @@ <translation>Gib die Adresse des E-Mail-Servers ein</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="92"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/> <source>Email address:</source> <translation>E-Mail-Adresse:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="116"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="180"/> <source>Enter your email signature</source> <translation>Gib die E-Mail-Signatur ein</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="99"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/> <source>Enter your email address</source> <translation>Gib die E-Mail-Adresse ein</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="138"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="192"/> <source>Select to authenticatate against the mail server</source> <translation>Auswählen, wenn der Mailserver eine Autorisierung verlangt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="141"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="195"/> <source>Mail server needs authentication</source> <translation>Mailserver verlangt Autorisierung</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="153"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="204"/> <source>Username:</source> <translation>Nutzername:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="173"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="218"/> <source>Password:</source> <translation>Kennwort:</translation> </message> @@ -13440,17 +13552,12 @@ <translation><b>E-Mail-Einstellungen</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="128"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="104"/> <source>Select to use TLS</source> <translation>Auswählen, um TLS zu verwenden</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="131"/> - <source>Use TLS</source> - <translation>Verwende TLS</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="60"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="124"/> <source>Enter the port of the mail server</source> <translation>Gibt den Port des E-Mail-Servers ein</translation> </message> @@ -13460,35 +13567,65 @@ <translation>Ausgangsmailserver (SMTP):</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/> - <source>Outgoing mail server port:</source> - <translation>Ausgangsmailserver Port:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="193"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="235"/> <source>Press to test the login data</source> <translation>Drücken, um die Anmeldedaten zu testen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="196"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="238"/> <source>Test Login</source> <translation>Anmeldung testen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/> <source>Login Test</source> <translation>Anmeldetest</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="138"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="204"/> <source>The login test succeeded.</source> <translation>Der Anmeldetest war erfolgreich.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/> <source><p>The login test failed.<br>Reason: {0}</p></source> <translation><p>Der Anmeldetest ist fehlgeschlagen.<br>Ursache: {0}</p></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/> + <source>Encryption Method:</source> + <translation>Verschlüsselungsmethode:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="81"/> + <source>Select to use no encryption</source> + <translation>Auswählen, um keine Verschlüsselung zu verwenden</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="84"/> + <source>None</source> + <translation>keine</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="94"/> + <source>Select to use SSL</source> + <translation>Auswählen, um SSL zu verwenden</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="97"/> + <source>SSL</source> + <translation>SSL</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="107"/> + <source>TLS</source> + <translation>TLS</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="117"/> + <source>Port:</source> + <translation>Port:</translation> + </message> </context> <context> <name>EricAccessHandler</name> @@ -14391,7 +14528,7 @@ <context> <name>ExceptionsFilterDialog</name> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="16"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="17"/> <source><b>Exception Filter</b> <p>This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the "Start Debugging" dialog is unchecked, no exception will be reported at all.</p> <p>Please note, that unhandled exceptions are always highlighted independent of these settings.</p></source> @@ -14400,47 +14537,47 @@ <p>Bitte beachten Sie, dass alle nicht abgefangenen Ausnahmen unabhängig von der Liste angezeigt werden.</p></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="69"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="64"/> <source>Delete</source> <translation>Löschen</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="52"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="51"/> <source>Enter an exception type that shall be highlighted</source> <translation>Gib einen anzuzeigenden Ausnahmetyp ein</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="27"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="28"/> <source>List of exceptions that shall be highlighted</source> <translation>Liste der anzuzeigenden Ausnahmen</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="42"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="41"/> <source>Press to add the entered exception to the list</source> <translation>Fügt die eingegebene Ausnahme zu der Liste hinzu</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="45"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="44"/> <source>Add</source> <translation>Hinzufügen</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="66"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="61"/> <source>Press to delete the selected exception from the list</source> <translation>Löscht die ausgewählte Ausnahme aus der Liste</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="13"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="14"/> <source>Exceptions Filter</source> <translation>Ausnahmen Filter</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="76"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="71"/> <source>Press to delete all exceptions from the list</source> <translation>Drücken, um alle aufgelisteten Ausnahmen zu löschen</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="79"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="74"/> <source>Delete All</source> <translation>Alle Löschen</translation> </message> @@ -16848,8 +16985,8 @@ </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1218"/> - <source>Open Link in New Tab Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen Strg+LMK</translation> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1291"/> @@ -21435,7 +21572,7 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1822"/> <source>The hg process did not finish within 30s.</source> <translation>Der hg-Prozess endete nicht innerhalb von 30s.</translation> </message> @@ -21485,147 +21622,147 @@ <translation>Benenne {0} um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1057"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1359"/> <source>Mercurial command</source> <translation>Mercurial-Befehl</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/> <source>Pulling from a remote Mercurial repository</source> <translation>Pull von einem entfernten Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2022"/> <source>Pushing to a remote Mercurial repository</source> <translation>Push in ein entferntes Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230"/> <source>Creating branch in the Mercurial repository</source> <translation>Erzeuge Zweig im Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verifiziere die Integrität des Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2427"/> <source>Showing aliases for remote repositories</source> <translation>Zeige Namen für entfernte Repositorys</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2451"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> <source>Shall the working directory be updated?</source> <translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2604"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2730"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2727"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial-Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2625"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2475"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source>Create .hgignore file</source> <translation>.hgignore-Datei erstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2759"/> <source>Removing files from the Mercurial repository only</source> <translation>Lösche Dateien nur aus dem Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2710"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2623"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2578"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Mercurial-Änderungsgruppendatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen Sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> @@ -21635,72 +21772,72 @@ <translation>Pflege Änderungen in das Mercurial-Repository ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> <source>Mercurial Command Server</source> <translation>Mercurial-Befehlsserver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial-Befehlsserver konnte nicht wiedergestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial-Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2959"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> <source>Add Sub-repository</source> <translation>Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gelesen werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub enthält bereits einen Eintrag <b>{0}</b>. Abbruch...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gespeichert werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source>Remove Sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation> </message> @@ -21715,157 +21852,157 @@ <translation>Das Einpflegen von Änderungen betrifft Dateien mit ungesicherten Änderungen. Soll die Aktion fortgesetzt werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1030"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="997"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation>Wollen Sie wirklich alle Änderungen an den folgenden Datein oder Verzeichnissen rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Do you really want to revert all changes of the project?</source> <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> <source>Create Unversioned Archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> <source>Mercurial Side-by-Side Difference</source> <translation>Mercurial Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Tagging in the Mercurial repository</source> <translation>Marke im Mercurial-Repository setzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Created new branch <{0}>.</source> <translation>Neuer Zweig <{0}> wurde angelegt.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1133"/> <source>Current branch tip</source> <translation>Spitze des aktuellen Zweigs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/> <source>Cancelling uncommitted merge</source> <translation>Breche Zusammenführung ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3614"/> <source>Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> <source>Delete Bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> <source>Select the bookmark to be deleted:</source> <translation>Wähle das zu löschende Lesezeichen aus:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Pull Bookmark</source> <translation>Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Select the bookmark to be pulled:</source> <translation>Wähle das herunterzuladende Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Lade Lesezeichen von einem entfernten Mercurial-Repository herunter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Push Bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Select the bookmark to be push:</source> <translation>Wähle das hochzuladende Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3924"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Lade Lesezeichen zu einem entfernten Mercurial-Repository hoch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> <source>Re-Merge</source> <translation>Neu zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> <source>Do you really want to re-merge these files or directories?</source> <translation>Wollen Sie wirklich diese Dateien oder Verzeichnisse neu zusammenführen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> <source>Do you really want to re-merge the project?</source> <translation>Wollen Sie wirklich das Projekt neu zusammenführen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> <source>Re-Merging</source> <translation>Neu zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/> <source>Marking as 'unresolved'</source> <translation>Markiere als 'nicht aufgelöst'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> <source>Marking as 'resolved'</source> <translation>Markiere als 'aufgelöst'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> <source>Delete All Backups</source> <translation>Alle Backups löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation><p>Sollen wirklich alle Backupdateien des Backupbereiches <b>{0}</b> gelöscht werden?</p></translation> </message> @@ -24172,7 +24309,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>Mercurial Log</source> <translation>Mercurial-Log</translation> </message> @@ -24202,17 +24339,17 @@ <translation>Wähle das als Filter zu verwendende Feld</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/> <source>Revision</source> <translation>Revision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="103"/> <source>Message</source> <translation>Nachricht</translation> </message> @@ -24232,132 +24369,132 @@ <translation>Marken</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="285"/> <source>Action</source> <translation>Aktion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="290"/> <source>Path</source> <translation>Pfad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="295"/> <source>Copy from</source> <translation>Kopiert von</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="306"/> <source>Press to get the next bunch of log entries</source> <translation>Drücken, um die nächsten Log-Einträge zu erhalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="309"/> <source>&Next</source> <translation>&Nächste</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="316"/> <source>Enter the limit of entries to fetch</source> <translation>Gib die Anzahl an zu holenden Einträgen ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="335"/> <source>Select to stop listing log messages at a copy or move</source> <translation>Auswählen, um die Anzeige von Log Meldungen bei einer Kopier- oder Verschiebeaktion zu stoppen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="338"/> <source>Stop on Copy/Move</source> <translation>Bei Kopieren/Umbenennen anhalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="462"/> <source>Errors</source> <translation>Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="468"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Mercurial-Log-Fehler</b><p>Dies zeigt mögliche Fehlermeldungen des hg log-Befehls.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="484"/> <source>Input</source> <translation>Eingabe</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="474"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="506"/> <source>Press to send the input to the hg process</source> <translation>Drücken um die Eingabe an den hg-Prozess zu senden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="477"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="509"/> <source>&Send</source> <translation>Sen&den</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="512"/> <source>Alt+S</source> <translation>Alt+D</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="519"/> <source>Enter data to be sent to the hg process</source> <translation>Gib die Daten ein, die an den hg-Prozess geschickt werden sollen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="526"/> <source>Select to switch the input field to password mode</source> <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="529"/> <source>&Password Mode</source> <translation>&Kennwortmodus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="532"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> <source>Added</source> <translation>Hinzugefügt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169"/> <source>Deleted</source> <translation>Gelöscht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source>Modified</source> <translation>Modifiziert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="993"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="993"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="666"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="747"/> <source>The hg process did not finish within 30s.</source> <translation>Der hg-Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="669"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="750"/> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="753"/> <source>Mercurial Error</source> <translation>Mercurial-Fehler</translation> </message> @@ -24367,32 +24504,32 @@ <translation>Grafik</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="378"/> <source>Press to generate a diff to the first parent revision</source> <translation>Drücken, um ein Diff zum ersten Vorgänger zu erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="381"/> <source>Diff to Parent &1</source> <translation>Diff zu Vorgänger &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> <source>Press to generate a diff to the second parent revision</source> <translation>Drücken, um ein Diff zum zweiten Vorgänger zu erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="391"/> <source>Diff to Parent &2</source> <translation>Diff zu Vorgänger &2</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="398"/> <source>Press to compare two revisions</source> <translation>Drücken, um zwei Revisionen zu vergleichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="401"/> <source>&Compare Revisions</source> <translation>&Vergleiche Revisionen</translation> </message> @@ -24407,32 +24544,32 @@ <translation>Wähle den als Filter zu verwendenden Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="147"/> <source>All</source> <translation>Alle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> <source>Mercurial Log (Incoming)</source> <translation>Mercurial-Log (Eingang)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="77"/> <source>Mercurial Log (Outgoing)</source> <translation>Mercurial-Log (Ausgang)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> <source>Bookmarks</source> <translation>Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="90"/> <source>Press to refresh the list of changesets</source> <translation>Drücken, um die Liste der Änderungssätze zu erneuern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> <source>&Refresh</source> <translation>&Erneuern</translation> </message> @@ -24442,83 +24579,83 @@ <translation>Phase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> <source>Change the phase of the selected revisions</source> <translation>Ändert die Phase der ausgewählten Revisionen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="227"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation><b>Phase ändern</b><p>Dies ändert die Phase der ausgewählten Revisionen. Die ausgewählten Revisionen müssen sich in der gleichen Phase befinden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1899"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2091"/> <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/HgLogBrowserDialog.ui" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="444"/> <source>Select to show differences side-by-side</source> <translation>Auswählen, um Unterschiede nebeinander anzuzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> <source>Show differences side-by-side</source> <translation>Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="421"/> <source>Select action from menu</source> <translation>Wähle eine Aktion aus dem Menü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> <source>Copy the selected changesets to the current branch</source> <translation>Ausgewählte Änderungssätze in den aktuellen Zweig kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> - <source>Tag</source> - <translation>Marke setzen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="204"/> - <source>Tag the selected revision</source> - <translation>Ausgewählte Revision mit einer Marke versehen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1773"/> - <source>Switch</source> - <translation>Umschalten</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="209"/> - <source>Switch the working directory to the selected revision</source> - <translation>Schaltet das Arbeitsverzeichnis auf die ausgewählte Revision um</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/> + <source>Tag</source> + <translation>Marke setzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="235"/> + <source>Tag the selected revision</source> + <translation>Ausgewählte Revision mit einer Marke versehen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1951"/> + <source>Switch</source> + <translation>Umschalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="240"/> + <source>Switch the working directory to the selected revision</source> + <translation>Schaltet das Arbeitsverzeichnis auf die ausgewählte Revision um</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/> <source>Pull Large Files</source> <translation>Binärriesen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="265"/> <source>Pull large files for selected revisions</source> <translation>Binärriesen der ausgewählten Revisionen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="983"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1087"/> <source>{0} (large file)</source> <translation>{0} (Binärriese)</translation> </message> @@ -24543,353 +24680,169 @@ <translation>Drücken, um das nächste Vorkommen zu suchen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Find</source> <translation>Suchen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> - <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></source> - <translation><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Datum</b></td><td>{1}</td></tr><tr><td><b>Autor</b></td><td>{2}</td></tr><tr><td><b>Zweig</b></td><td>{3}</td></tr><tr><td><b>Eltern</b></td><td>{4}</td></tr>{5}</table></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marken</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2192"/> <source>Find Commit</source> <translation>Revision finden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2192"/> <source>'{0}' was not found.</source> <translation>„{0}“ wurde nicht gefunden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/> <source>File</source> <translation>Datei</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174"/> <source>Draft</source> <translation>Entwurf</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> <source>Public</source> <translation>Öffentlich</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/> <source>Secret</source> <translation>Geheim</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2049"/> <source>Pull Changes</source> <translation>Änderungen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="261"/> <source>Pull changes from a remote repository</source> <translation>Änderungen von einem entfernten Repository herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="274"/> <source>Push Selected Changes</source> <translation>Ausgewählte Änderungen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation>Änderungen des ausgewählten Änderungssatzes und aller Vorgänger in ein entferntes Repository hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> <source>Push All Changes</source> <translation>Alle Änderungen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/> <source>Push all changes to a remote repository</source> <translation>Alle Änderungen an ein entferntes Repository hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1852"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2030"/> <source>Fetch Changes</source> <translation>Änderungen abholen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2091"/> <source>Strip Changesets</source> <translation>Änderungssätze löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> <source>Fetch changes from a remote repository</source> <translation>Änderungen von einem entfernten Repository herunterladen und einarbeiten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="291"/> <source>Strip changesets from a repository</source> <translation>Änderungssätze aus einem Repository löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="245"/> <source>Define Bookmark...</source> <translation>Lesezeichen hinzufügen …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="248"/> <source>Bookmark the selected revision</source> <translation>Lesezeichen für die ausgewählte Revision erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250"/> <source>Move Bookmark...</source> <translation>Lesezeichen verschieben …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253"/> <source>Move bookmark to the selected revision</source> <translation>Verschiebe ein Lesezeichen zur ausgewählten Revision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1972"/> <source>Define Bookmark</source> <translation>Lesezeichen hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1972"/> <source>Enter bookmark name for changeset "{0}":</source> <translation>Gib einen Lesezeichennamen für den Änderungssatz "{0}" ein: </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1816"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1994"/> <source>Move Bookmark</source> <translation>Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1816"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1994"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation>Wähle ein Lesezeichen aus, das zum Änderungssatz "{0}" verschoben werden soll: </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1937"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation>Wähle das Lesezeichen aus, auf das umgeschaltet werden soll (leer lassen, um Revision zu verwenden):</translation> </message> -</context> -<context> - <name>HgLogDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="14"/> - <source>Mercurial Log</source> - <translation>Mercurial-Log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="26"/> - <source>Log</source> - <translation>Log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="32"/> - <source><b>Mercurial Log</b><p>This shows the output of the hg log command. By clicking on the links you may show the difference between revisions.</p></source> - <translation><b>Mercurial-Log</b><p>Dies zeigt die Ausgabe des hg log-Befehls. Durch Anklicken der Verweise kann der Unterschied zwischen den Versionen angezeigt werden.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="61"/> - <source>Errors</source> - <translation>Fehler</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="67"/> - <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> - <translation><b>Mercurial-Log-Fehler</b><p>Dies zeigt mögliche Fehlermeldungen des hg log-Befehls.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="83"/> - <source>Input</source> - <translation>Eingabe</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="105"/> - <source>Press to send the input to the hg process</source> - <translation>Drücken um die Eingabe an den hg-Prozess zu senden</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="108"/> - <source>&Send</source> - <translation>Sen&den</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="111"/> - <source>Alt+S</source> - <translation>Alt+D</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="118"/> - <source>Enter data to be sent to the hg process</source> - <translation>Gib die Daten ein, die an den hg-Prozess geschickt werden sollen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="125"/> - <source>Select to switch the input field to password mode</source> - <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="128"/> - <source>&Password Mode</source> - <translation>&Kennwortmodus</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="131"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="64"/> - <source><b>Processing your request, please wait...</b></source> - <translation><b>Verarbeite Ihre Anfrage, bitte warten...</b></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="74"/> - <source>Revision</source> - <translation>Revision</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> - <source>Process Generation Error</source> - <translation>Fehler beim Prozessstart</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/> - <source>No log available for '{0}'</source> - <translation>Kein Log für „{0}“ verfügbar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="344"/> - <source>diff to {0}</source> - <translation>Unterschied zu {0}</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="358"/> - <source>Tags: {0}<br /> -</source> - <translation>Marken: {0}<br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="364"/> - <source>Parents: {0}<br /> -</source> - <translation>Vorgänger: {0}<br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="367"/> - <source><i>Author: {0}</i><br /> -</source> - <translation><i>Autor: {0}</i><br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="371"/> - <source><i>Date: {0}, {1}</i><br /> -</source> - <translation><i>Datum: {0}, {1}</i><br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="387"/> - <source>Added {0}<br /> -</source> - <translation>Hinzugefügt: {0}<br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="393"/> - <source>Modified {0}<br /> -</source> - <translation>Modifiziert: {0}<br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="399"/> - <source>Deleted {0}<br /> -</source> - <translation>Gelöscht: {0}<br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="270"/> - <source>The hg process did not finish within 30s.</source> - <translation>Der hg-Prozess endete nicht innerhalb von 30s.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> - <source>Could not start the hg executable.</source> - <translation>Das hg Programm konnte nicht gestartet werden.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="276"/> - <source>Mercurial Error</source> - <translation>Mercurial-Fehler</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="382"/> - <source>Added {0} (copied from {1})<br /> -</source> - <translation>Hinzugefügt: {0} (kopiert von {1})</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="361"/> - <source>Bookmarks: {0}<br /> -</source> - <translation>Lesezeichen: {0}<br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="352"/> - <source>Phase: {0}<br /> -</source> - <translation>Phase: {0}<br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="45"/> - <source>Select to show differences side-by-side</source> - <translation>Auswählen, um Unterschiede nebeinander anzuzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="48"/> - <source>Show differences side-by-side</source> - <translation>Unterschiede nebeneinander anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="355"/> - <source>Branch: {0}<br /> -</source> - <translation>Zweig: {0}<br /> -</translation> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr><tr><td><b>Children</b></td><td>{5}</td></tr>{6}</table></source> + <translation><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Datum</b></td><td>{1}</td></tr><tr><td><b>Autor</b></td><td>{2}</td></tr><tr><td><b>Zweig</b></td><td>{3}</td></tr><tr><td><b>Eltern</b></td><td>{4}</td></tr><tr><td><b>Kinder</b></td><td>{5}</td></tr>{6}</table></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <source>Press to move up in the log list</source> + <translation>Drücken, um in der Historie nach oben zu gehen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="368"/> + <source>Press to move down in the log list</source> + <translation>Drücken, um in der Historie nach unten zu gehen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> + <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Letzte Marke</b></td><td>{0}</td></tr></translation> </message> </context> <context> @@ -25252,87 +25205,82 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="605"/> <source>Version Control</source> <translation>Versionskontrolle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="617"/> <source>Commit changes to repository...</source> <translation>Änderungen einpflegen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> <source>Add to repository</source> <translation>Zum Repository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628"/> <source>Remove from repository (and disk)</source> <translation>Vom Repository (und der Platte) löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="548"/> - <source>Show log</source> - <translation>Beschreibungen anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="552"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="544"/> <source>Show log browser</source> <translation>Zeige Log Browser</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> <source>Show status</source> <translation>Status anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="343"/> <source>Show annotated file</source> <translation>Zeige kommentierte Datei</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="663"/> <source>Select all local file entries</source> <translation>Alle lokalen Dateieinträge auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="665"/> <source>Select all versioned file entries</source> <translation>Alle versionierten Dateieinträge auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> <source>Select all local directory entries</source> <translation>Alle lokalen Verzeichniseinträge auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="669"/> <source>Select all versioned directory entries</source> <translation>Alle versionierten Verzeichniseinträge auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Remove from repository only</source> <translation>Nur vom Repository löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Do you really want to remove these files from the repository?</source> <translation>Wollen Sie wirklich diese Dateien vom Repository löschen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="539"/> <source>Copy</source> <translation>Kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="541"/> <source>Move</source> <translation>Verschieben</translation> </message> @@ -25342,42 +25290,42 @@ <translation>Erweiterungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="639"/> <source>Show differences</source> <translation>Unterschiede anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="329"/> <source>Show differences side-by-side</source> <translation>Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="651"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="643"/> <source>Show differences (extended)</source> <translation>Unterschiede anzeigen (erweitert)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="338"/> <source>Show differences side-by-side (extended)</source> <translation>Unterschiede nebeneinander anzeigen (erweitert)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="653"/> <source>Conflicts resolved</source> <translation>Konflikte gelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="656"/> <source>Conflicts unresolved</source> <translation>Konflikte ungelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659"/> <source>Re-Merge</source> <translation>Neu zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="672"/> <source>Configure...</source> <translation>Einstellungen...</translation> </message> @@ -25526,581 +25474,561 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> - <source>Show log</source> - <translation>Beschreibungen anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> - <source>Show &log</source> - <translation>&Beschreibungen anzeigen</translation> + <source>Show log browser</source> + <translation>Zeige Log Browser</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> - <source>Show the log of the local project</source> - <translation>Zeigt die Änderungsbeschreibungen des lokalen Projektes an</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation>Zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> - <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation><b>Beschreibungen anzeigen</b><p>Dies zeigt die Änderungsbeschreibungen (Log) des lokalen Projektes an.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> - <source>Show log browser</source> - <translation>Zeige Log Browser</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>Zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Zeige Log Browser</b><p>Dies zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen. Zunächst wird nur eine begrenzte Anzahl an Einträgen angezeigt. Weitere können später geholt werden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show &difference</source> <translation>&Unterschiede anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> <source>Show the difference of the local project to the repository</source> <translation>Zeigt den Unterschied des lokalen Projektes zum Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Zeigt den Unterschied von Revisionen des Projektes an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> <source>Show status</source> <translation>Status anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> <source>Show the status of the local project</source> <translation>Zeige den Status des lokalen Projektes an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Status anzeigen</b><p>Dies zeigt den Status des lokalen Projektes an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> <source>Show heads</source> <translation>Köpfe anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Show the heads of the repository</source> <translation>Zeigt die Köpfe des Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Köpfe anzeigen</b><p>Dies zeigt die Köpfe des Repository an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357"/> <source>Show parents</source> <translation>Vorgänger anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Show the parents of the repository</source> <translation>Zeigt die Vorgänger des repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Vorgänger anzeigen</b><p>Dies zeigt die Vorgänger des repository an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="371"/> <source>Show tip</source> <translation>Spitze (tip) anzeigen</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <source>Show the tip of the repository</source> + <translation>Zeigt die Spitze (tip) des Repository an</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> + <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> + <translation><b>Spitze (tip) anzeigen</b><p>Dies zeigt die Spitze (tip) des Repository an.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <source>Revert changes</source> + <translation>Änderungen rückgängig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <source>Re&vert changes</source> + <translation>Änderungen &rückgängig</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> - <source>Show the tip of the repository</source> - <translation>Zeigt die Spitze (tip) des Repository an</translation> + <source>Revert all changes made to the local project</source> + <translation>Alle Änderungen am lokalen Projekt werden rückgängig gemacht</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> - <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> - <translation><b>Spitze (tip) anzeigen</b><p>Dies zeigt die Spitze (tip) des Repository an.</p></translation> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation><b>Änderungen rückgängig</b><p>Dies macht alle Änderungen am lokalen Projekt werden rückgängig.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> - <source>Revert changes</source> - <translation>Änderungen rückgängig</translation> + <source>Merge</source> + <translation>Änderungen zusammenführen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> - <source>Re&vert changes</source> - <translation>Änderungen &rückgängig</translation> + <source>Mer&ge changes...</source> + <translation>Änderungen &zusammenführen...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> - <source>Revert all changes made to the local project</source> - <translation>Alle Änderungen am lokalen Projekt werden rückgängig gemacht</translation> + <source>Merge changes of a revision into the local project</source> + <translation>Änderungen einer Revision mit dem lokalen Projekt zusammenführen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation><b>Änderungen rückgängig</b><p>Dies macht alle Änderungen am lokalen Projekt werden rückgängig.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> - <source>Merge</source> - <translation>Änderungen zusammenführen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> - <source>Mer&ge changes...</source> - <translation>Änderungen &zusammenführen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> - <source>Merge changes of a revision into the local project</source> - <translation>Änderungen einer Revision mit dem lokalen Projekt zusammenführen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Änderungen zusammenführen</b><p>Dies führt Änderungen einer Revision mit dem lokalen Projekt zusammen.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <source>Tag in repository</source> + <translation>Im Repository markieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <source>&Tag in repository...</source> + <translation>Im Repository &markieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <source>Tag the local project in the repository</source> + <translation>Das lokale Projekt im Repository markieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Im Repository markieren</b><p>Dies markiert das lokale Projekt im Repository.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> - <source>Tag in repository</source> - <translation>Im Repository markieren</translation> + <source>List tags</source> + <translation>Marken listen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> - <source>&Tag in repository...</source> - <translation>Im Repository &markieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> - <source>Tag the local project in the repository</source> - <translation>Das lokale Projekt im Repository markieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Im Repository markieren</b><p>Dies markiert das lokale Projekt im Repository.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> - <source>List tags</source> - <translation>Marken listen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags...</source> <translation>Marken listen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> <source>List tags of the project</source> <translation>Listet Marken des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Marken listen</b><p>Dies listet die Marken des Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>List branches</source> <translation>Zweige listen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>List branches...</source> <translation>Zweige listen...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> + <source>List branches of the project</source> + <translation>Listet Zweige des Projektes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Zweige listen</b><p>Dies listet die Zweige des Projektes.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create branch</source> + <translation>Zweig erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create &branch...</source> + <translation>&Zweig erzeugen...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> - <source>List branches of the project</source> - <translation>Listet Zweige des Projektes</translation> + <source>Create a new branch for the local project in the repository</source> + <translation>Erzeuge einen neuen Zweig für das lokale Projekt im Repository</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Zweige listen</b><p>Dies listet die Zweige des Projektes.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Create branch</source> - <translation>Zweig erzeugen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Create &branch...</source> - <translation>&Zweig erzeugen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> - <source>Create a new branch for the local project in the repository</source> - <translation>Erzeuge einen neuen Zweig für das lokale Projekt im Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Zweig erzeugen</b><p>Dies erzeugt einen neuen Zweig für das lokale Projekt im Repository</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> <source>Close branch</source> <translation>Zweig abschließen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> <source>Close the current branch of the local project</source> <translation>Schließt den aktuellen Zweig des lokalen Projektes ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Zweig abschließen</b><p>Dies schließt den aktuellen Zweig des lokalen Projektes ab.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>Switch</source> <translation>Umschalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>S&witch...</source> <translation>Umschal&ten...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <source>Switch the working directory to another revision</source> + <translation>Schaltet das Arbeitsverzeichnis auf eine andere Revision um</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation><b>Umschalten</b><p>Dies schaltet das lokale Arbeitsverzeichnis auf eine andere Revision um.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Cleanup</source> + <translation>Aufräumen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Cleanu&p</source> + <translation>Au&fräumen</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Switch the working directory to another revision</source> - <translation>Schaltet das Arbeitsverzeichnis auf eine andere Revision um</translation> + <source>Cleanup the local project</source> + <translation>Räume das lokale Projekt auf</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> - <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> - <translation><b>Umschalten</b><p>Dies schaltet das lokale Arbeitsverzeichnis auf eine andere Revision um.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source>Cleanup</source> - <translation>Aufräumen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source>Cleanu&p</source> - <translation>Au&fräumen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> - <source>Cleanup the local project</source> - <translation>Räume das lokale Projekt auf</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Aufräumen</b><p>Dies räumt das lokale Projekt auf.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <source>Execute command</source> + <translation>Befehl ausführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <source>E&xecute command...</source> + <translation>Befehl ausf&ühren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <source>Execute an arbitrary Mercurial command</source> + <translation>Führe einen beliebigen Mercurial-Befehl aus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> + <translation><b>Befehl ausführen</b><p>Dies öffnet einen Dialog zur Eingabe eines beliebeigen Mercurial-Befehls.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>Execute command</source> - <translation>Befehl ausführen</translation> + <source>Configure</source> + <translation>Einstellungen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>E&xecute command...</source> - <translation>Befehl ausf&ühren...</translation> + <source>Configure...</source> + <translation>Einstellungen...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> - <source>Execute an arbitrary Mercurial command</source> - <translation>Führe einen beliebigen Mercurial-Befehl aus</translation> + <source>Show the configuration dialog with the Mercurial page selected</source> + <translation>Zeigt den Konfigurationsdialog mit ausgewählter Mercurial-Seite</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> - <translation><b>Befehl ausführen</b><p>Dies öffnet einen Dialog zur Eingabe eines beliebeigen Mercurial-Befehls.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Configure</source> - <translation>Einstellungen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Configure...</source> - <translation>Einstellungen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> - <source>Show the configuration dialog with the Mercurial page selected</source> - <translation>Zeigt den Konfigurationsdialog mit ausgewählter Mercurial-Seite</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Einstellungen</b><p>Zeigt den Konfigurationsdialog mit ausgewählter Mercurial-Seite.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths</source> <translation>Pfade anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths...</source> <translation>Pfade anzeigen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <source>Show the aliases for remote repositories</source> <translation>Zeigt die Namen für entfernte Repositorys</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Pfade anzeigen</b><p>Dies zeigt die Namen für entfernte Repositorys.</p<</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository</source> <translation>Repository verifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository...</source> <translation>Repository verifizieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> <source>Verify the integrity of the repository</source> <translation>Verfiziert die Integrität des Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Repository verifizieren</b><p>Dies verfiziert die Integrität des Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover</source> <translation>Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover...</source> <translation>Transaktion zurücksetzen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> <source>Recover from an interrupted transaction</source> <translation>Setzt eine abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Transaktion zurücksetzen</b><p>Dies setzt eine abgebrochene Transaktion zurück.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> <source>Create .hgignore</source> <translation>Erstelle .hgignore</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <source>Create a .hgignore file with default values</source> + <translation>Erstelle eine .hgignore-Datei mit Standardwerten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation><b>Erstelle .hgignore</b><p>Dies erstellt eine .hgignore-Datei mit Standardwerten.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup</source> + <translation>Änderungsgruppe erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup...</source> + <translation>Änderungsgruppe erzeugen...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> - <source>Create a .hgignore file with default values</source> - <translation>Erstelle eine .hgignore-Datei mit Standardwerten</translation> + <source>Create changegroup file collecting changesets</source> + <translation>Erzeuge eine Änderungsgruppendatei für Änderungssätze</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1793"/> + <source>Apply changegroups</source> + <translation>Änderungsgruppen anwenden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> + <source>Apply changegroups...</source> + <translation>Änderungsgruppen anwenden...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <source>Apply one or several changegroup files</source> + <translation>Wende eine oder mehrere Änderungsgruppendateien an</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <source>Changegroup Management</source> + <translation>Verwaltung von Änderungsgruppen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation><b>Erstelle .hgignore</b><p>Dies erstellt eine .hgignore-Datei mit Standardwerten.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> - <source>Create changegroup</source> - <translation>Änderungsgruppe erzeugen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> - <source>Create changegroup...</source> - <translation>Änderungsgruppe erzeugen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> - <source>Create changegroup file collecting changesets</source> - <translation>Erzeuge eine Änderungsgruppendatei für Änderungssätze</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1810"/> - <source>Apply changegroups</source> - <translation>Änderungsgruppen anwenden</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> - <source>Apply changegroups...</source> - <translation>Änderungsgruppen anwenden...</translation> + <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> + <translation><b>Änderungsgruppe erzeugen</b><p>Dies erzeuge eine Änderungsgruppendatei für ausgewählte Änderungssätze (hg bundle).</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> + <translation><b>Änderungsgruppen anwenden</b><p>Dies wendet eine oder mehrere mit „Änderungsgruppe erzeugen“ erstellte Änderungsgruppendateien an (hg unbundle).</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> + <source>Show current branch</source> + <translation>Zeige aktuellen Zweig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Show the current branch of the project</source> + <translation>Zeigt den aktuellen Zweig des Projektes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation><b>Zeige aktuellen Zweig</b><p>Dies zeigt den aktuellen Zweig des Projektes.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <source>Mark as "good"</source> + <translation>Als „gut“ markieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> - <source>Apply one or several changegroup files</source> - <translation>Wende eine oder mehrere Änderungsgruppendateien an</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1324"/> - <source>Changegroup Management</source> - <translation>Verwaltung von Änderungsgruppen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> - <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> - <translation><b>Änderungsgruppe erzeugen</b><p>Dies erzeuge eine Änderungsgruppendatei für ausgewählte Änderungssätze (hg bundle).</p></translation> + <source>Mark a selectable changeset as good</source> + <translation>Markiere einen auswählbaren Änderungssatz als gut</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> - <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> - <translation><b>Änderungsgruppen anwenden</b><p>Dies wendet eine oder mehrere mit „Änderungsgruppe erzeugen“ erstellte Änderungsgruppendateien an (hg unbundle).</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> - <source>Show current branch</source> - <translation>Zeige aktuellen Zweig</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> - <source>Show the current branch of the project</source> - <translation>Zeigt den aktuellen Zweig des Projektes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation><b>Zeige aktuellen Zweig</b><p>Dies zeigt den aktuellen Zweig des Projektes.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source>Mark as "good"</source> - <translation>Als „gut“ markieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> - <source>Mark a selectable changeset as good</source> - <translation>Markiere einen auswählbaren Änderungssatz als gut</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Als gut markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als gut.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source>Mark as "bad"</source> <translation>Als „schlecht“ markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> <source>Mark a selectable changeset as bad</source> <translation>Markiere einen auswählbaren Änderungssatz als schlecht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Als schlecht markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als schlecht.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <source>Skip</source> <translation>Überspringen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> <source>Reset</source> <translation>Zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> <source>Reset the bisect search data</source> <translation>Setzt die Bisect Suchdaten zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Zurücksetzen</b><p>Dies setzt die Bisect Suchdaten zurück.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> <source>Mark as "good"...</source> <translation>Als „gut“ markieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source>Mark as "bad"...</source> <translation>Als „schlecht“ markieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> <source>Preview changegroup...</source> <translation>Änderungsgruppe ansehen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify</source> <translation>Identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify...</source> <translation>Identifizieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> <source>Identify the project directory</source> <translation>Identifiziere das Projektverzeichnis</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identifizieren</b><p>Dies identifiziert das Projektverzeichnis.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Eine Änderungsgruppendatei für Änderungssätze ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Änderungsgruppe ansehen</b><p>Dies zeigt den Inhalt einer Änderungsgruppendatei für Änderungssätze an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> <source>Back out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> <source>Back out changes of an earlier changeset</source> <translation>Änderungen eines früheren Änderungssatzes umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Änderungssatz umkehren</b><p>Dies kehrt die Änderungen eines früheren Änderungssatzes um.</p></translation> </message> @@ -26120,687 +26048,687 @@ <translation><b>Änderungen hochladen (force)</b><p>Dies lädt Änderungen vom lokalen Repository an ein entferntes Repository mit der Option „force“ hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1300"/> <source>Specials</source> <translation>Spezialfunktionen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> <source>Serve project repository</source> <translation>Server für Projektrepository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> <source>Serve project repository...</source> <translation>Server für Projektrepository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Serve the project repository</source> <translation>Server für das Projektrepository bereitstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Server für Projektrepository<b><p>Dies stellt einen Server für das Projektrepository zur Verfügung.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1627"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1610"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> <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/ProjectHelper.py" line="566"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> <source>Push new branch</source> <translation>Neuen Zweig hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Push the current branch of the local project as a new named branch</source> <translation>Lade den aktuellen Zweig als neuen benannten Zweig hoch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation><b>Neuen Zweig hochladen</b><p>Dies lädt den aktuellen Zweig als neuen benannten Zweig hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Rollback the last transaction</source> <translation>Die letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Extensions</source> <translation>Erweiterungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Edit user configuration</source> <translation>Nutzerkonfiguration editieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Edit user configuration...</source> <translation>Nutzerkonfiguration editieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Show an editor to edit the user configuration file</source> <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation><b>Nutzerkonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration</source> + <translation>Repositorykonfiguration editieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration...</source> + <translation>Repositorykonfiguration editieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <source>Show an editor to edit the repository configuration file</source> + <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation><b>Repositorykonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Edit repository configuration</source> - <translation>Repositorykonfiguration editieren</translation> + <source>Show combined configuration settings</source> + <translation>Zeige kombinierte Einstellungen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Edit repository configuration...</source> - <translation>Repositorykonfiguration editieren...</translation> + <source>Show combined configuration settings...</source> + <translation>Zeige kombinierte Einstellungen...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> - <source>Show an editor to edit the repository configuration file</source> - <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation><b>Repositorykonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <source>Show combined configuration settings</source> - <translation>Zeige kombinierte Einstellungen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <source>Show combined configuration settings...</source> - <translation>Zeige kombinierte Einstellungen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show the combined configuration settings from all configuration files</source> <translation>Zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation><b>Zeige kombinierte Einstellungen</b><p>Dies zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <source>Skip...</source> <translation>Überspringen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> <source>Skip a selectable changeset</source> <translation>Überspringe einen auswählbaren Änderungssatz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation><b>Überspringen</b><p>Dies überspringt einen auswählbaren Änderungssatz.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1849"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> <source>Import Patch...</source> <translation>Patch importieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Import a patch from a patch file</source> <translation>Einen Patch aus einer Patchdatei importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation><b>Patch importieren</b><p>Dies importiert einen Patch aus einer Patchdatei in das Projekt.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1316"/> <source>Patch Management</source> <translation>Verwaltung von Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1869"/> <source>Revert Changes</source> <translation>Änderungen rückgängig machen</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Export Patches</source> + <translation>Patches exportieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Export Patches...</source> + <translation>Patches exportieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <source>Export revisions to patch files</source> + <translation>Änderungssätze in Patchdateien exportieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation><b>Patches exportieren</b><p>Dies exportiert Änderungssätze des projektes in Patchdateien.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> - <source>Export Patches</source> - <translation>Patches exportieren</translation> + <source>Change Phase</source> + <translation>Phase ändern</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> - <source>Export Patches...</source> - <translation>Patches exportieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> - <source>Export revisions to patch files</source> - <translation>Änderungssätze in Patchdateien exportieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation><b>Patches exportieren</b><p>Dies exportiert Änderungssätze des projektes in Patchdateien.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> - <source>Change Phase</source> - <translation>Phase ändern</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase...</source> <translation>Phase ändern...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> + <source>Change the phase of revisions</source> + <translation>Ändert die Phase von Revisionen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation><b>Phase ändern</b><p>Dies ändert die Phase von Revisionen.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1889"/> + <source>Copy Changesets</source> + <translation>Änderungssätze kopieren</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> - <source>Change the phase of revisions</source> - <translation>Ändert die Phase von Revisionen</translation> + <source>Copies changesets from another branch</source> + <translation>Änderungssätze aus einem anderen Zweig kopieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> - <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> - <translation><b>Phase ändern</b><p>Dies ändert die Phase von Revisionen.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1906"/> - <source>Copy Changesets</source> - <translation>Änderungssätze kopieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> - <source>Copies changesets from another branch</source> - <translation>Änderungssätze aus einem anderen Zweig kopieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation><b>Änderungssätze kopieren</b><p>Dies kopiert Änderungssätze aus einem anderen Zweig mit dem Nutzernamen, der Datums und der Änderungsmeldung des Originaländerungssatzes in das Arbeitsverzeichnis.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> + <source>Continue Copying Session</source> + <translation>Kopiersitzung fortsetzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation>Setzt die letzte Kopiersitzung nach Lösung von Konflikten fort</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation><b>Kopiersitzung fortsetzen</b><p>Dies setzt die letzte Kopiersitzung nach Lösung von Konflikten fort.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/> + <source>Graft</source> + <translation>Graft</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <source>Copy Changesets (Continue)</source> + <translation>Änderungssätze kopieren (Fortsetzung)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Conflicts resolved</source> + <translation>Konflikte gelöst</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Con&flicts resolved</source> + <translation>&Konflikte gelöst</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation>Markiert alle Konflikte des lokalen Projektes als gelöst</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation><b>Konflikte gelöst</b><p>Dies markiert alle Konflikte des lokalen Projektes als gelöst.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> - <source>Continue Copying Session</source> - <translation>Kopiersitzung fortsetzen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation>Setzt die letzte Kopiersitzung nach Lösung von Konflikten fort</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation><b>Kopiersitzung fortsetzen</b><p>Dies setzt die letzte Kopiersitzung nach Lösung von Konflikten fort.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1393"/> - <source>Graft</source> - <translation>Graft</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/> - <source>Copy Changesets (Continue)</source> - <translation>Änderungssätze kopieren (Fortsetzung)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Conflicts resolved</source> - <translation>Konflikte gelöst</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Con&flicts resolved</source> - <translation>&Konflikte gelöst</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation>Markiert alle Konflikte des lokalen Projektes als gelöst</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation><b>Konflikte gelöst</b><p>Dies markiert alle Konflikte des lokalen Projektes als gelöst.</p></translation> + <source>Add</source> + <translation>Hinzufügen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <source>Add...</source> + <translation>Hinzufügen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <source>Add a sub-repository</source> + <translation>Ein Unterrepository hinzufügen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> + <translation><b>Hinzufügen...</b><p>Ein Unterrepository zum Projekt hinzufügen.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> + <source>Remove</source> + <translation>Entfernen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Add</source> - <translation>Hinzufügen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Add...</source> - <translation>Hinzufügen...</translation> + <source>Remove...</source> + <translation>Entfernen...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> - <source>Add a sub-repository</source> - <translation>Ein Unterrepository hinzufügen</translation> + <source>Remove sub-repositories</source> + <translation>Unterrepositorys löschen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> - <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> - <translation><b>Hinzufügen...</b><p>Ein Unterrepository zum Projekt hinzufügen.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> - <source>Remove</source> - <translation>Entfernen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> - <source>Remove...</source> - <translation>Entfernen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> - <source>Remove sub-repositories</source> - <translation>Unterrepositorys löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation><b>Entfernen...</b><p>Unterrepositorys aus dem Projekt löschen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> <source>Sub-Repository</source> <translation>Unterrepository</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> + <source>Show &status...</source> + <translation>Status an&zeigen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <source>Show Summary</source> + <translation>Übersichtsinformationen anzeigen</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> - <source>Show &status...</source> - <translation>Status an&zeigen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> - <source>Show Summary</source> - <translation>Übersichtsinformationen anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show summary...</source> <translation>Übersichtsinformationen anzeigen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> <source>Show summary information of the working directory status</source> <translation>Zeige Übersichtsinformationen zum Status des Arbeitsverzeichnisses</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation><b>Übersichtsinformationen anzeigen</b><p>Dies zeigt Übersichtsinformationen zum Status des Arbeitsverzeichnisses.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create unversioned archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create unversioned archive...</source> <translation>Erzeuge nicht versioniertes Archiv...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> <source>Create an unversioned archive from the repository</source> <translation>Erzeuge ein unversioniertes Archive des Repositories</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation><b>Erzeuge nicht versioniertes Archiv...</b><p>Dies erzeugt ein unversioniertes Archive des Repositories.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation><b>Letzte Transaktion zurücksetzen</b><p>Dies setzt die letzte Transaktion zurück. Transaktionen werden verwendet, um die Effekte aller Befehle, die neue Änderungssätze erzeugen oder vorhandene Änderungssätze in das Repository propagieren, zu kapseln. So arbeiten z.B. die folgenden Befehle transaktional und ihre Effekte können zurückgesetzt werden:<ul><li>commit</li><li>import</li><li>pull</li><li>push (mit diesem repository als Ziel)</li><li>unbundle</li></ul></p><p><strong>Dieser Befehl kann gefährlich sein. Bitte mit Vorsicht verwenden.</strong></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/> <source>Administration</source> <translation>Verwaltung</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show differences</source> <translation>Unterschiede anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> <source>Show differences (extended)</source> <translation>Unterschiede anzeigen (erweitert)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation><b>Unterschiede anzeigen</b><p>Dies zeigt Unterschiede des lokalen Projektes zum Repository an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation><b>Unterschiede anzeigen (erweitert)</b><p>Dies zeigt Unterschiede von Revisionen des Projektes an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> <source>Cancel uncommitted merge</source> <translation>Zusammenführung abbrechen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> <source>Cancel an uncommitted merge and lose all changes</source> <translation>Bricht eine nicht eingepflegte Zusammenführung unter Verlust aller Änderungen ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> <translation><b>Zusammenführung abbrechen</b><p>Dies bricht eine nicht eingepflegte Zusammenführung unter Verlust aller Änderungen ab.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <source>List bookmarks</source> + <translation>Lesezeichen listen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <source>List bookmarks...</source> + <translation>Lesezeichen listen …</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <source>List bookmarks of the project</source> + <translation>Listet Lesezeichen des Projektes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation><b>Lesezeichen listen</b><p>Dies listet die Lesezeichen des Projektes.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>List bookmarks</source> - <translation>Lesezeichen listen</translation> + <source>Define bookmark</source> + <translation>Lesezeichen hinzufügen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>List bookmarks...</source> - <translation>Lesezeichen listen …</translation> + <source>Define bookmark...</source> + <translation>Lesezeichen hinzufügen …</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> - <source>List bookmarks of the project</source> - <translation>Listet Lesezeichen des Projektes</translation> + <source>Define a bookmark for the project</source> + <translation>Fügt dem Projekt ein Lesezeichen hinzu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation><b>Lesezeichen listen</b><p>Dies listet die Lesezeichen des Projektes.</p></translation> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <translation><b>Lesezeichen hinzufügen</b><p>Dies fügt dem Projekt ein Lesezeichen hinzu.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Define bookmark</source> - <translation>Lesezeichen hinzufügen</translation> + <source>Delete bookmark</source> + <translation>Lesezeichen löschen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Define bookmark...</source> - <translation>Lesezeichen hinzufügen …</translation> + <source>Delete bookmark...</source> + <translation>Lesezeichen löschen …</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> - <source>Define a bookmark for the project</source> - <translation>Fügt dem Projekt ein Lesezeichen hinzu</translation> + <source>Delete a bookmark of the project</source> + <translation>Löscht ein Lesezeichen aus dem Projekt</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation><b>Lesezeichen hinzufügen</b><p>Dies fügt dem Projekt ein Lesezeichen hinzu.</p></translation> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation><b>Lesezeichen löschen</b><p>Dies löscht ein Lesezeichen aus dem Projekt.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Delete bookmark</source> - <translation>Lesezeichen löschen</translation> + <source>Rename bookmark</source> + <translation>Lesezeichen umbenennen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Delete bookmark...</source> - <translation>Lesezeichen löschen …</translation> + <source>Rename bookmark...</source> + <translation>Lesezeichen umbenennen …</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <source>Delete a bookmark of the project</source> - <translation>Löscht ein Lesezeichen aus dem Projekt</translation> + <source>Rename a bookmark of the project</source> + <translation>Benennt ein Lesezeichen des Projektes um</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation><b>Lesezeichen löschen</b><p>Dies löscht ein Lesezeichen aus dem Projekt.</p></translation> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation><b>Lesezeichen umbenennen</b><p>Dies benennt ein Lesezeichen des Projektes um</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Rename bookmark</source> - <translation>Lesezeichen umbenennen</translation> + <source>Move bookmark</source> + <translation>Lesezeichen verschieben</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Rename bookmark...</source> - <translation>Lesezeichen umbenennen …</translation> + <source>Move bookmark...</source> + <translation>Lesezeichen verschieben …</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> - <source>Rename a bookmark of the project</source> - <translation>Benennt ein Lesezeichen des Projektes um</translation> + <source>Move a bookmark of the project</source> + <translation>Verschiebt ein Lesezeichen des Projektes</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation><b>Lesezeichen umbenennen</b><p>Dies benennt ein Lesezeichen des Projektes um</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source>Move bookmark</source> - <translation>Lesezeichen verschieben</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source>Move bookmark...</source> - <translation>Lesezeichen verschieben …</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> - <source>Move a bookmark of the project</source> - <translation>Verschiebt ein Lesezeichen des Projektes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation><b>Lesezeichen verschieben</b><p>Dies verschiebt ein Lesezeichen des Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1144"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> <source>Show incoming bookmarks</source> <translation>Zeige eingehende Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Show a list of incoming bookmarks</source> <translation>Zeigt eine Liste eingehender Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation><b>Zeige eingehende Lesezeichen</b><p>Dies zeigt eine Liste neuer Lesezeichen, die in einem entfernten Repository verfügbar sind, an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Pull bookmark</source> <translation>Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> <source>Pull a bookmark from a remote repository</source> <translation>Ein Lesezeichen von einem entfernten Repository herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Lesezeichen herunterladen</b><p>Dies lädt ein Lesezeichen von einem entfernten Repository in das lokale Repository herunter.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> <source>Show outgoing bookmarks</source> <translation>Zeige ausgehende Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> <source>Show a list of outgoing bookmarks</source> <translation>Zeigt eine Liste ausgehender Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation><b>Zeige ausgehende Lesezeichen</b><p>Dies zeigt eine Liste neuer Lesezeichen, die im lokalen Repository verfügbar sind, an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/> <source>Push bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> <source>Push a bookmark to a remote repository</source> <translation>Ein Lesezeichen an ein entferntes Repository hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <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/ProjectHelper.py" line="1361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> <source>Bookmarks</source> <translation>Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> <source>Tags</source> <translation>Marken</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> <source>Branches</source> <translation>Zweige</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>Re-Merge</source> <translation>Neu zusammenführen</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <source>Re-Merge all conflicting, unresolved files of the project</source> + <translation>Alle Dateien des Projektes mit nicht aufgelösten Konflikten erneut zusammenführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts</source> + <translation>Zeige Konflikte</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts...</source> + <translation>Zeige Konflikte...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> - <source>Re-Merge all conflicting, unresolved files of the project</source> - <translation>Alle Dateien des Projektes mit nicht aufgelösten Konflikten erneut zusammenführen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Show conflicts</source> - <translation>Zeige Konflikte</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Show conflicts...</source> - <translation>Zeige Konflikte...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> <source>Show a dialog listing all files with conflicts</source> <translation>Zeige einen Dialog mit allen Dateien mit Konflikten an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> - <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> - <translation><b>Zeige Konflikte</b><p>Dies zeigt einen Dialog mit allen Dateien, die einen Konflikt hatten oder noch haben.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> - <source>Conflicts unresolved</source> - <translation>Konflikte ungelöst</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> - <source>Mark all conflicts of the local project as unresolved</source> - <translation>Markiert alle Konflikte des lokalen Projektes als ungelöst</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> - <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> - <translation><b>Konflikte ungelöst</b><p>Dies markiert alle Konflikte des lokalen Projektes als ungelöst.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> - <source>Manage Changes</source> - <translation>Änderungen verwalten</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> + <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> + <translation><b>Zeige Konflikte</b><p>Dies zeigt einen Dialog mit allen Dateien, die einen Konflikt hatten oder noch haben.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> + <source>Conflicts unresolved</source> + <translation>Konflikte ungelöst</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <source>Mark all conflicts of the local project as unresolved</source> + <translation>Markiert alle Konflikte des lokalen Projektes als ungelöst</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> + <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> + <translation><b>Konflikte ungelöst</b><p>Dies markiert alle Konflikte des lokalen Projektes als ungelöst.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> + <source>Manage Changes</source> + <translation>Änderungen verwalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation><b>Neu zusammenführen</b><p>Dies führt alle Dateien des Projektes mit nicht aufgelösten Konflikten unter Verlust sämtlicher vorangegangener Versuche erneut zusammen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> <source>Pull current bookmark</source> <translation>Aktuelles Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> <source>Pull the current bookmark from a remote repository</source> <translation>Das aktuelle Lesezeichen von einem entfernten Repository herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation><b>Aktuelles Lesezeichen herunterladen</b><p>Dies lädt das aktuelle Lesezeichen von einem entfernten Repository in das lokale Repository herunter.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> <source>Push current bookmark</source> <translation>Aktuelles Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source>Push the current bookmark to a remote repository</source> <translation>Das aktuelle Lesezeichen an ein entferntes Repository hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation><b>Aktuelles Lesezeichen hochladen</b><p>Dies lädt das aktuelle Lesezeichen vom lokalen Repository an ein entferntes Repository hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> <source>Delete all backups</source> <translation>Alle Backups löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> <source>Delete all backup bundles stored in the backup area</source> <translation>Löscht alle Backupdateien im Backupbereich</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation><b>Alle Backups löschen</b><p>Dies löscht alle Backupdateien im Backupbereich des Repository.</p></translation> </message> @@ -29857,6 +29785,42 @@ </message> </context> <context> + <name>HtmlProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/HtmlProvider.py" line="388"/> + <source>Create List</source> + <translation>Liste erzeugen</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HtmlProvider.py" line="388"/> + <source>Enter desired number of list elements:</source> + <translation>Gib die vorgesehene Anzahl Listenelemente ein:</translation> + </message> +</context> +<context> + <name>HyperlinkMarkupDialog</name> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="14"/> + <source>Insert Hyperlink</source> + <translation>Hyperlink hinzufügen</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="23"/> + <source>Link Text:</source> + <translation>Linktext:</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="33"/> + <source>Link Target:</source> + <translation>Linkziel:</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="43"/> + <source>Link Title:</source> + <translation>Linktitel:</translation> + </message> +</context> +<context> <name>IExplorerImporter</name> <message> <location filename="../WebBrowser/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="40"/> @@ -30058,1065 +30022,1090 @@ <translation>Windows-Bitmap-Datei (*.bmp)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="128"/> + <location filename="../IconEditor/IconEditorWindow.py" line="130"/> <source>Graphic Interchange Format File (*.gif)</source> <translation>Graphic-Interchange-Format-Datei (*.gif)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="129"/> + <location filename="../IconEditor/IconEditorWindow.py" line="132"/> <source>Windows Icon File (*.ico)</source> <translation>Windows Icon-Datei (*.ico)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="130"/> + <location filename="../IconEditor/IconEditorWindow.py" line="134"/> <source>JPEG File (*.jpg)</source> <translation>JPEG-Datei (*.jpg)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="133"/> - <source>Portable Bitmap File (*.pbm)</source> - <translation>Portable-Bitmap-Datei (*.pbm)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="135"/> - <source>Portable Graymap File (*.pgm)</source> - <translation>Portable-Graymap-Datei (*.pgm)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="136"/> - <source>Portable Network Graphics File (*.png)</source> - <translation>Portable-Network-Graphics-Datei (*.png)</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="137"/> - <source>Portable Pixmap File (*.ppm)</source> - <translation>Portable-Pixmap-Datei (*.ppm)</translation> + <source>Portable Bitmap File (*.pbm)</source> + <translation>Portable-Bitmap-Datei (*.pbm)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="139"/> - <source>Scalable Vector Graphics File (*.svg)</source> - <translation>Scalable-Vector-Graphics-Datei (*.svg)</translation> + <source>Portable Graymap File (*.pgm)</source> + <translation>Portable-Graymap-Datei (*.pgm)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="140"/> + <source>Portable Network Graphics File (*.png)</source> + <translation>Portable-Network-Graphics-Datei (*.png)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="141"/> + <source>Portable Pixmap File (*.ppm)</source> + <translation>Portable-Pixmap-Datei (*.ppm)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="143"/> - <source>TIFF File (*.tif)</source> - <translation>TIFF-Datei (*.tif)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="146"/> - <source>X11 Bitmap File (*.xbm)</source> - <translation>X11-Bitmap-Datei (*.xbm)</translation> + <source>Scalable Vector Graphics File (*.svg)</source> + <translation>Scalable-Vector-Graphics-Datei (*.svg)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="147"/> + <source>TIFF File (*.tif)</source> + <translation>TIFF-Datei (*.tif)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="151"/> + <source>X11 Bitmap File (*.xbm)</source> + <translation>X11-Bitmap-Datei (*.xbm)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="152"/> <source>X11 Pixmap File (*.xpm)</source> <translation>X11-Pixmap-Datei (*.xpm)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="158"/> + <location filename="../IconEditor/IconEditorWindow.py" line="163"/> <source>All Files (*)</source> <translation>Alle Dateien (*)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>New</source> <translation>Neu</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>&New</source> <translation>&Neu</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>Ctrl+N</source> <comment>File|New</comment> <translation>Ctrl+N</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="196"/> + <location filename="../IconEditor/IconEditorWindow.py" line="201"/> <source>Create a new icon</source> <translation>Erzeuge ein neues Icon</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="197"/> + <location filename="../IconEditor/IconEditorWindow.py" line="202"/> <source><b>New</b><p>This creates a new icon.</p></source> <translation><b>Neu</b><p>Dies erzeugt ein neues Icon.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="204"/> + <location filename="../IconEditor/IconEditorWindow.py" line="209"/> <source>New Window</source> <translation>Neues Fenster</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="204"/> - <source>New &Window</source> - <translation>Neues &Fenster</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="209"/> + <source>New &Window</source> + <translation>Neues &Fenster</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="214"/> <source>Open a new icon editor window</source> <translation>Öffne ein neues Icon-Editor-Fenster</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="211"/> + <location filename="../IconEditor/IconEditorWindow.py" line="216"/> <source><b>New Window</b><p>This opens a new icon editor window.</p></source> <translation><b>Neues Fenster</b><p>Dies öffnet ein neues Icon-Editor-Fenster.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>Open</source> <translation>Öffnen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>&Open...</source> <translation>&Öffnen...</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>Ctrl+O</source> <comment>File|Open</comment> <translation>Ctrl+O</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="224"/> + <location filename="../IconEditor/IconEditorWindow.py" line="229"/> <source>Open an icon file for editing</source> <translation>Öffne eine Icon-Datei zum Editieren</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="225"/> + <location filename="../IconEditor/IconEditorWindow.py" line="230"/> <source><b>Open File</b><p>This opens a new icon file for editing. It pops up a file selection dialog.</p></source> <translation><b>Datei öffnen</b><p>Dies öffnet eine neue Icon-Datei zum editieren. Es wird zunächst ein Dateiauswahldialog angezeigt.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>Save</source> <translation>Speichern</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>&Save</source> <translation>&Speichern</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>Ctrl+S</source> <comment>File|Save</comment> <translation>Ctrl+S</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="239"/> + <location filename="../IconEditor/IconEditorWindow.py" line="244"/> <source>Save the current icon</source> <translation>Speichert das aktuelle Icon</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="240"/> + <location filename="../IconEditor/IconEditorWindow.py" line="245"/> <source><b>Save File</b><p>Save the contents of the icon editor window.</p></source> <translation><b>Datei speichern</b><p>Dies speichert den Inhalt des Icon-Editor-Fensters.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Save As</source> <translation>Speichern unter</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Save &As...</source> <translation>Speichern &unter...</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Shift+Ctrl+S</source> <comment>File|Save As</comment> <translation>Shift+Ctrl+S</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="253"/> + <location filename="../IconEditor/IconEditorWindow.py" line="258"/> <source>Save the current icon to a new file</source> <translation>Speichert das aktuelle Icon in eine neue Datei</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="255"/> + <location filename="../IconEditor/IconEditorWindow.py" line="260"/> <source><b>Save As...</b><p>Saves the current icon to a new file.</p></source> <translation><b>Speichern unter</b><p>Dies speichert das aktuelle Icon in eine Datei.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>Close</source> <translation>Schließen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>&Close</source> <translation>Schl&ießen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>Ctrl+W</source> <comment>File|Close</comment> <translation>Ctrl+W</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="268"/> + <location filename="../IconEditor/IconEditorWindow.py" line="273"/> <source>Close the current icon editor window</source> <translation>Schließt das aktuelle Icon-Editor-Fenster</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="270"/> + <location filename="../IconEditor/IconEditorWindow.py" line="275"/> <source><b>Close</b><p>Closes the current icon editor window.</p></source> <translation><b>Schließen</b><p>Schließt das aktuelle Icon-Editor-Fenster.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="277"/> + <location filename="../IconEditor/IconEditorWindow.py" line="282"/> <source>Close All</source> <translation>Alle schließen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="277"/> + <location filename="../IconEditor/IconEditorWindow.py" line="282"/> <source>Close &All</source> <translation>Alle &schließen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="281"/> + <location filename="../IconEditor/IconEditorWindow.py" line="286"/> <source>Close all icon editor windows</source> <translation>Schließt alle Icon-Editor-Fenster</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="283"/> + <location filename="../IconEditor/IconEditorWindow.py" line="288"/> <source><b>Close All</b><p>Closes all icon editor windows except the first one.</p></source> <translation><b>Alle schließen</b><p>Schließt alle Icon-Editor-Fenster mit Ausnahme des ersten.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>Quit</source> <translation>Beenden</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>&Quit</source> <translation>B&eenden</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>Ctrl+Q</source> <comment>File|Quit</comment> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="309"/> + <location filename="../IconEditor/IconEditorWindow.py" line="314"/> <source>Quit the icon editor</source> <translation>Beendet den Icon-Editor</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="310"/> + <location filename="../IconEditor/IconEditorWindow.py" line="315"/> <source><b>Quit</b><p>Quit the icon editor.</p></source> <translation><b>Beenden</b><p>Beendet den Icon-Editor.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Undo</source> <translation>Rückgängig</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>&Undo</source> <translation>&Rückgängig</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Ctrl+Z</source> <comment>Edit|Undo</comment> <translation>Ctrl+Z</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Alt+Backspace</source> <comment>Edit|Undo</comment> <translation>Alt+Backspace</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="329"/> + <location filename="../IconEditor/IconEditorWindow.py" line="334"/> <source>Undo the last change</source> <translation>Die letzte Änderung rückgängig machen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="330"/> + <location filename="../IconEditor/IconEditorWindow.py" line="335"/> <source><b>Undo</b><p>Undo the last change done.</p></source> <translation><b>Rückgängig</b><p>Dies macht die letzte Änderung rückgängig.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>Redo</source> <translation>Wiederherstellen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>&Redo</source> <translation>Wieder&herstellen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>Ctrl+Shift+Z</source> <comment>Edit|Redo</comment> <translation>Ctrl+Shift+Z</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="343"/> + <location filename="../IconEditor/IconEditorWindow.py" line="348"/> <source>Redo the last change</source> <translation>Die letzte Änderung wiederherstellen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="344"/> + <location filename="../IconEditor/IconEditorWindow.py" line="349"/> <source><b>Redo</b><p>Redo the last change done.</p></source> <translation><b>Wiederherstellen</b><p>Dies stellt die letzte Änderung wieder her.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Cut</source> <translation>Ausschneiden</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Cu&t</source> <translation>&Ausschneiden</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Ctrl+X</source> <comment>Edit|Cut</comment> <translation>Ctrl+X</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Shift+Del</source> <comment>Edit|Cut</comment> <translation>Shift+Del</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="358"/> + <location filename="../IconEditor/IconEditorWindow.py" line="363"/> <source>Cut the selection</source> <translation>Schneidet die Auswahl aus</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="359"/> + <location filename="../IconEditor/IconEditorWindow.py" line="364"/> <source><b>Cut</b><p>Cut the selected image area to the clipboard.</p></source> <translation><b>Ausschneiden</b><p>Dies schneidet den ausgewählten Bildbereich aus.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Copy</source> <translation>Kopieren</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>&Copy</source> <translation>&Kopieren</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Ctrl+C</source> <comment>Edit|Copy</comment> <translation>Ctrl+C</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Ctrl+Ins</source> <comment>Edit|Copy</comment> <translation>Ctrl+Einfg</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="373"/> + <location filename="../IconEditor/IconEditorWindow.py" line="378"/> <source>Copy the selection</source> <translation>Kopiert die Auswahl</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="374"/> + <location filename="../IconEditor/IconEditorWindow.py" line="379"/> <source><b>Copy</b><p>Copy the selected image area to the clipboard.</p></source> <translation><b>Kopieren</b><p>Dies kopiert den ausgewählten Bildbereich in die Zwischenablage.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Paste</source> <translation>Einfügen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>&Paste</source> <translation>Ein&fügen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Ctrl+V</source> <comment>Edit|Paste</comment> <translation>Ctrl+V</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Shift+Ins</source> <comment>Edit|Paste</comment> <translation>Shift+Ins</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="388"/> + <location filename="../IconEditor/IconEditorWindow.py" line="393"/> <source>Paste the clipboard image</source> <translation>Fügt das Bild der Zwischenablage ein</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="389"/> + <location filename="../IconEditor/IconEditorWindow.py" line="394"/> <source><b>Paste</b><p>Paste the clipboard image.</p></source> <translation><b>Einfügen</b><p>Fügt das Bild der Zwischenablage ein.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="396"/> + <location filename="../IconEditor/IconEditorWindow.py" line="401"/> <source>Paste as New</source> <translation>Als Neu einfügen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="396"/> + <location filename="../IconEditor/IconEditorWindow.py" line="401"/> <source>Paste as &New</source> <translation>Als &Neu einfügen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="400"/> + <location filename="../IconEditor/IconEditorWindow.py" line="405"/> <source>Paste the clipboard image replacing the current one</source> <translation>Fügt das Bild der Zwischenablage ein und ersetzt das aktuelle Bild</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="402"/> + <location filename="../IconEditor/IconEditorWindow.py" line="407"/> <source><b>Paste as New</b><p>Paste the clipboard image replacing the current one.</p></source> <translation><b>Als Neu einfügen</b><p>Fügt das Bild der Zwischenablage ein und ersetzt das aktuelle Bild.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Clear</source> <translation>Löschen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Cl&ear</source> <translation>&Löschen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Alt+Shift+C</source> <comment>Edit|Clear</comment> <translation>Alt+Shift+C</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="416"/> + <location filename="../IconEditor/IconEditorWindow.py" line="421"/> <source>Clear the icon image</source> <translation>Löscht das Icon</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="417"/> + <location filename="../IconEditor/IconEditorWindow.py" line="422"/> <source><b>Clear</b><p>Clear the icon image and set it to be completely transparent.</p></source> <translation><b>Löschen</b><p>Löscht das Icon und setzt es auf vollständig transparent.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>Select All</source> <translation>Alles auswählen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>&Select All</source> <translation>&Alles auswählen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>Ctrl+A</source> <comment>Edit|Select All</comment> <translation>Ctrl+A</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="431"/> + <location filename="../IconEditor/IconEditorWindow.py" line="436"/> <source>Select the complete icon image</source> <translation>Wählt das komplette Icon aus</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="433"/> + <location filename="../IconEditor/IconEditorWindow.py" line="438"/> <source><b>Select All</b><p>Selects the complete icon image.</p></source> <translation><b>Alles auswählen</b><p>Wählt das komplette Icon aus.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="440"/> + <location filename="../IconEditor/IconEditorWindow.py" line="445"/> <source>Change Size</source> <translation>Größe ändern</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="440"/> + <location filename="../IconEditor/IconEditorWindow.py" line="445"/> <source>Change Si&ze...</source> <translation>&Größe ändern...</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="446"/> + <location filename="../IconEditor/IconEditorWindow.py" line="451"/> <source>Change the icon size</source> <translation>Ändert die Größe des Icons</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="447"/> + <location filename="../IconEditor/IconEditorWindow.py" line="452"/> <source><b>Change Size...</b><p>Changes the icon size.</p></source> <translation><b>Größe ändern...</b><p>Ändert die Größe des Icons.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="454"/> + <location filename="../IconEditor/IconEditorWindow.py" line="459"/> <source>Grayscale</source> <translation>Graustufen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="454"/> + <location filename="../IconEditor/IconEditorWindow.py" line="459"/> <source>&Grayscale</source> <translation>Gra&ustufen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="460"/> + <location filename="../IconEditor/IconEditorWindow.py" line="465"/> <source>Change the icon to grayscale</source> <translation>Konvertiert das Icon in Graustufen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="462"/> + <location filename="../IconEditor/IconEditorWindow.py" line="467"/> <source><b>Grayscale</b><p>Changes the icon to grayscale.</p></source> <translation><b>Graustufen</b><p>Konvertiert das Icon in Graustufen.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Zoom in</source> <translation>Vergrößern</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Zoom &in</source> <translation>Ver&größern</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Ctrl++</source> <comment>View|Zoom in</comment> <translation>Ctrl++</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="497"/> + <location filename="../IconEditor/IconEditorWindow.py" line="502"/> <source>Zoom in on the icon</source> <translation>Iconansicht vergrößern</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="498"/> + <location filename="../IconEditor/IconEditorWindow.py" line="503"/> <source><b>Zoom in</b><p>Zoom in on the icon. This makes the grid bigger.</p></source> <translation><b>Vergrößern</b><p>Das angezeigte Icon vergrößern. Dies stellt das Gitter größer dar.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Zoom out</source> <translation>Verkleinern</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Zoom &out</source> <translation>Ver&kleinern</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Ctrl+-</source> <comment>View|Zoom out</comment> <translation>Ctrl+-</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="511"/> + <location filename="../IconEditor/IconEditorWindow.py" line="516"/> <source>Zoom out on the icon</source> <translation>Iconansicht verkleinern</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="512"/> + <location filename="../IconEditor/IconEditorWindow.py" line="517"/> <source><b>Zoom out</b><p>Zoom out on the icon. This makes the grid smaller.</p></source> <translation><b>Verkleinern</b><p>Das angezeigte Icon verkleinern. Dies stellt das Gitter kleiner dar.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Zoom reset</source> <translation>Vergrößerung zurücksetzen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Zoom &reset</source> <translation>Vergrößerung &zurücksetzen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Ctrl+0</source> <comment>View|Zoom reset</comment> <translation>Ctrl+0</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="535"/> + <location filename="../IconEditor/IconEditorWindow.py" line="540"/> <source>Show Grid</source> <translation>Gitter anzeigen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="535"/> + <location filename="../IconEditor/IconEditorWindow.py" line="540"/> <source>Show &Grid</source> <translation>&Gitter anzeigen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="541"/> + <location filename="../IconEditor/IconEditorWindow.py" line="546"/> <source>Toggle the display of the grid</source> <translation>Schaltet die Anzeige des Gitters um</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="543"/> + <location filename="../IconEditor/IconEditorWindow.py" line="548"/> <source><b>Show Grid</b><p>Toggle the display of the grid.</p></source> <translation><b>Gitter anzeigen</b><p>Schaltet die Anzeige des Gitters um.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="562"/> + <location filename="../IconEditor/IconEditorWindow.py" line="567"/> <source>Freehand</source> <translation>Freihand</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="562"/> + <location filename="../IconEditor/IconEditorWindow.py" line="567"/> <source>&Freehand</source> <translation>&Freihand</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="568"/> + <location filename="../IconEditor/IconEditorWindow.py" line="573"/> <source><b>Free hand</b><p>Draws non linear lines.</p></source> <translation><b>Freihand</b><p>Zeichnet nichtlineare Linien.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="577"/> + <location filename="../IconEditor/IconEditorWindow.py" line="582"/> <source>Color Picker</source> <translation>Farbauswahl</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="577"/> + <location filename="../IconEditor/IconEditorWindow.py" line="582"/> <source>&Color Picker</source> <translation>Far&bauswahl</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="583"/> + <location filename="../IconEditor/IconEditorWindow.py" line="588"/> <source><b>Color Picker</b><p>The color of the pixel clicked on will become the current draw color.</p></source> <translation><b>Farbauswahl</b><p>Die farbe des Pixels, auf das geklickt wurde, wird die aktuelle Zeichenfarbe.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="594"/> + <location filename="../IconEditor/IconEditorWindow.py" line="599"/> <source>Rectangle</source> <translation>Rechteck</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="594"/> + <location filename="../IconEditor/IconEditorWindow.py" line="599"/> <source>&Rectangle</source> <translation>&Rechteck</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="600"/> + <location filename="../IconEditor/IconEditorWindow.py" line="605"/> <source><b>Rectangle</b><p>Draw a rectangle.</p></source> <translation><b>Rechteck</b><p>Zeichnet ein Rechteck.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="609"/> + <location filename="../IconEditor/IconEditorWindow.py" line="614"/> <source>Filled Rectangle</source> <translation>Gefülltes Rechteck</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="609"/> + <location filename="../IconEditor/IconEditorWindow.py" line="614"/> <source>F&illed Rectangle</source> <translation>&Gefülltes Rechteck</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="615"/> + <location filename="../IconEditor/IconEditorWindow.py" line="620"/> <source><b>Filled Rectangle</b><p>Draw a filled rectangle.</p></source> <translation><b>Gefülltes Rechteck</b><p>Zeichnet ein gefülltes Rechteck.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="625"/> + <location filename="../IconEditor/IconEditorWindow.py" line="630"/> <source>Circle</source> <translation>Kreis</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="631"/> + <location filename="../IconEditor/IconEditorWindow.py" line="636"/> <source><b>Circle</b><p>Draw a circle.</p></source> <translation><b>Kreis</b><p>Zeichnet einen Kreis.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="640"/> + <location filename="../IconEditor/IconEditorWindow.py" line="645"/> <source>Filled Circle</source> <translation>Gefüllter Kreis</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="640"/> + <location filename="../IconEditor/IconEditorWindow.py" line="645"/> <source>Fille&d Circle</source> <translation>Gef&üllter Kreis</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="646"/> + <location filename="../IconEditor/IconEditorWindow.py" line="651"/> <source><b>Filled Circle</b><p>Draw a filled circle.</p></source> <translation><b>Gefüllter Kreis</b><p>Zeichnet einen gefüllten Kreis.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="656"/> + <location filename="../IconEditor/IconEditorWindow.py" line="661"/> <source>Ellipse</source> <translation>Ellipse</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="656"/> + <location filename="../IconEditor/IconEditorWindow.py" line="661"/> <source>&Ellipse</source> <translation>&Ellipse</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="662"/> + <location filename="../IconEditor/IconEditorWindow.py" line="667"/> <source><b>Ellipse</b><p>Draw an ellipse.</p></source> <translation><b>Ellipse</b><p>Zeichnet eine Ellipse.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="671"/> + <location filename="../IconEditor/IconEditorWindow.py" line="676"/> <source>Filled Ellipse</source> <translation>Gefüllte Ellipse</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="671"/> + <location filename="../IconEditor/IconEditorWindow.py" line="676"/> <source>Fille&d Elli&pse</source> <translation>Gefüllte Elli&pse</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="677"/> + <location filename="../IconEditor/IconEditorWindow.py" line="682"/> <source><b>Filled Ellipse</b><p>Draw a filled ellipse.</p></source> <translation><b>Gefüllte Ellipse</b><p>Zeichnet eine gefüllte Ellipse.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="687"/> + <location filename="../IconEditor/IconEditorWindow.py" line="692"/> <source>Flood Fill</source> <translation>Durchgehende Füllung</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="687"/> + <location filename="../IconEditor/IconEditorWindow.py" line="692"/> <source>Fl&ood Fill</source> <translation>&Durchgehende Füllung</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="693"/> + <location filename="../IconEditor/IconEditorWindow.py" line="698"/> <source><b>Flood Fill</b><p>Fill adjoining pixels with the same color with the current color.</p></source> <translation><b>Durchgehende Füllung</b><p>Benchbarte Pixel der selben Farbe werden mit der aktuellen Farbe gefüllt.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="703"/> + <location filename="../IconEditor/IconEditorWindow.py" line="708"/> <source>Line</source> <translation>Linie</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="703"/> + <location filename="../IconEditor/IconEditorWindow.py" line="708"/> <source>&Line</source> <translation>&Linie</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="709"/> + <location filename="../IconEditor/IconEditorWindow.py" line="714"/> <source><b>Line</b><p>Draw a line.</p></source> <translation><b>Linie</b><p>Zeichnet eine Linie.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="718"/> + <location filename="../IconEditor/IconEditorWindow.py" line="723"/> <source>Eraser (Transparent)</source> <translation>Radierer (transparent)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="718"/> + <location filename="../IconEditor/IconEditorWindow.py" line="723"/> <source>Eraser (&Transparent)</source> <translation>Radierer (&transparent)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="724"/> + <location filename="../IconEditor/IconEditorWindow.py" line="729"/> <source><b>Eraser (Transparent)</b><p>Erase pixels by setting them to transparent.</p></source> <translation><b>Radierer (transparent)</b><p>Löscht Pixel indem sie auf transparent gesetzt werden.</b></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="733"/> + <location filename="../IconEditor/IconEditorWindow.py" line="738"/> <source>Rectangular Selection</source> <translation>Rechteck-Auswahl</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="750"/> + <location filename="../IconEditor/IconEditorWindow.py" line="755"/> <source>Rect&angular Selection</source> <translation>Rechteck-&Auswahl</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="739"/> + <location filename="../IconEditor/IconEditorWindow.py" line="744"/> <source><b>Rectangular Selection</b><p>Select a rectangular section of the icon using the mouse.</p></source> <translation><b>Rechteck-Auswahl</b><p>Wählt einen rechteckigen Bereich des Icons mit der Maus aus.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="750"/> + <location filename="../IconEditor/IconEditorWindow.py" line="755"/> <source>Circular Selection</source> <translation>Kreisförmige Auswahl</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="756"/> + <location filename="../IconEditor/IconEditorWindow.py" line="761"/> <source><b>Circular Selection</b><p>Select a circular section of the icon using the mouse.</p></source> <translation><b>Kreisförmige Auswahl</b><p>Wählt einen kreisförmigen Bereich des Icons mit der Maus aus.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="773"/> + <location filename="../IconEditor/IconEditorWindow.py" line="778"/> <source>About</source> <translation>Über</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="773"/> + <location filename="../IconEditor/IconEditorWindow.py" line="778"/> <source>&About</source> <translation>Ü&ber</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="777"/> + <location filename="../IconEditor/IconEditorWindow.py" line="782"/> <source>Display information about this software</source> <translation>Zeigt Informationen zu diesem Programm an</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="779"/> + <location filename="../IconEditor/IconEditorWindow.py" line="784"/> <source><b>About</b><p>Display some information about this software.</p></source> <translation><b>Über</b><p>Zeigt einige Informationen über dieses Programm an.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="785"/> + <location filename="../IconEditor/IconEditorWindow.py" line="790"/> <source>About Qt</source> <translation>Über Qt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="785"/> + <location filename="../IconEditor/IconEditorWindow.py" line="790"/> <source>About &Qt</source> <translation>Über &Qt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="789"/> + <location filename="../IconEditor/IconEditorWindow.py" line="794"/> <source>Display information about the Qt toolkit</source> <translation>Zeige Informationen über das Qt-Toolkit an</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="791"/> + <location filename="../IconEditor/IconEditorWindow.py" line="796"/> <source><b>About Qt</b><p>Display some information about the Qt toolkit.</p></source> <translation><b>Über Qt</b><p>Zeige Informationen über das Qt-Toolkit an.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>What's This?</source> <translation>Was ist das?</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>&What's This?</source> <translation>&Was ist das?</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>Shift+F1</source> <comment>Help|What's This?'</comment> <translation>Shift+F1</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="804"/> + <location filename="../IconEditor/IconEditorWindow.py" line="809"/> <source>Context sensitive help</source> <translation>Kontextsensitive Hilfe</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="805"/> + <location filename="../IconEditor/IconEditorWindow.py" line="810"/> <source><b>Display context sensitive help</b><p>In What's This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.</p></source> <translation><b>Zeige kontextsensitive Hilfe an<b></p>Im „Was ist das?“-Modus (der Mauszeiger stellt einen Pfeil mit Fragezeichen dar) wird auf einen Mausklick eine kurze Hilfebeschreibung zu dem ausgewählten MMI-Element angezeigt. In Dialogen kann diese Funktionalität durch den entsprechenden Knopf im Fensterkopf erreicht werden.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="822"/> + <location filename="../IconEditor/IconEditorWindow.py" line="827"/> <source>&File</source> <translation>&Datei</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="839"/> + <location filename="../IconEditor/IconEditorWindow.py" line="844"/> <source>&Edit</source> <translation>&Bearbeiten</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="855"/> + <location filename="../IconEditor/IconEditorWindow.py" line="860"/> <source>&View</source> <translation>&Ansicht</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="863"/> + <location filename="../IconEditor/IconEditorWindow.py" line="868"/> <source>&Tools</source> <translation>&Werkzeuge</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="882"/> + <location filename="../IconEditor/IconEditorWindow.py" line="887"/> <source>&Help</source> <translation>&Hilfe</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="892"/> + <location filename="../IconEditor/IconEditorWindow.py" line="897"/> <source>File</source> <translation>Datei</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="906"/> + <location filename="../IconEditor/IconEditorWindow.py" line="911"/> <source>Edit</source> <translation>Bearbeiten</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="919"/> - <source>View</source> - <translation>Ansicht</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="924"/> + <source>View</source> + <translation>Ansicht</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="929"/> <source>Tools</source> <translation>Werkzeuge</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="942"/> + <location filename="../IconEditor/IconEditorWindow.py" line="947"/> <source>Help</source> <translation>Hilfe</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="956"/> + <location filename="../IconEditor/IconEditorWindow.py" line="961"/> <source><p>This part of the status bar displays the icon size.</p></source> <translation><p>Dieser Teil der Statusleiste zeigt die aktuelle Icongröße an.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="963"/> + <location filename="../IconEditor/IconEditorWindow.py" line="968"/> <source><p>This part of the status bar displays the cursor position.</p></source> <translation><p>Dieser Teil der Statusleiste zeigt die Cursorposition an.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1059"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1064"/> <source>Open icon file</source> <translation>Icon-Datei öffnen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1109"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1114"/> <source>Save icon file</source> <translation>Icon-Datei speichern</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1198"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1203"/> <source>Icon saved</source> <translation>Icon gespeichert</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1213"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1218"/> <source>Untitled</source> <translation>Unbenannt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1217"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1222"/> <source>{0}[*] - {1}</source> <translation>{0}[*] – {1}</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1217"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1222"/> <source>Icon Editor</source> <translation>Icon-Editor</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="132"/> + <location filename="../IconEditor/IconEditorWindow.py" line="136"/> <source>Multiple-Image Network Graphics File (*.mng)</source> <translation>Multiple-Image-Network-Graphics-Datei (*.mng)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="525"/> + <location filename="../IconEditor/IconEditorWindow.py" line="530"/> <source>Reset the zoom of the icon</source> <translation>Die Vergrößerung des Icons zurücksetzen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="527"/> + <location filename="../IconEditor/IconEditorWindow.py" line="532"/> <source><b>Zoom reset</b><p>Reset the zoom of the icon. This sets the zoom factor to 100%.</p></source> <translation><b>Vergrößerung zurücksetzen</b><p>Setzt die Vergrößerung des Icons zurück. Es setzt die Vergrößerung auf den Wert 100 % zurück.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="134"/> - <source>Paintbrush Bitmap File (*.pcx)</source> - <translation>Paintbrush-Bitmap-Datei (*.pcx)</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="138"/> - <source>Silicon Graphics Image File (*.sgi)</source> - <translation>Silicon-Graphics-Bild-Datei (*.sgi)</translation> + <source>Paintbrush Bitmap File (*.pcx)</source> + <translation>Paintbrush-Bitmap-Datei (*.pcx)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="142"/> + <source>Silicon Graphics Image File (*.sgi)</source> + <translation>Silicon-Graphics-Bild-Datei (*.sgi)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="146"/> <source>Targa Graphic File (*.tga)</source> <translation>Targa-Grafik-Datei (*.tga)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1145"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1150"/> <source>The file '{0}' does not exist.</source> <translation>Die Datei „{0}“ existiert nicht.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1152"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1157"/> <source>Cannot read file '{0}: {1}.</source> <translation>Datei {0} kann nicht gelesen werden: {1}.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1186"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1191"/> <source>Cannot write file '{0}: {1}.</source> <translation>Datei {0} kann nicht geschrieben werden: {1}.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1109"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1114"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1238"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1243"/> <source>The icon image has unsaved changes.</source> <translation>Das Icon-Bild hat ungesicherte Änderungen.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="131"/> + <location filename="../IconEditor/IconEditorWindow.py" line="135"/> <source>JPEG File (*.jpeg)</source> <translation>JPEG-Datei (*.jpeg)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="140"/> - <source>Compressed Scalable Vector Graphics File (*.svgz)</source> - <translation>Komprimierte Scalable-Vector-Graphics-Datei (*.svgz)</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="144"/> + <source>Compressed Scalable Vector Graphics File (*.svgz)</source> + <translation>Komprimierte Scalable-Vector-Graphics-Datei (*.svgz)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="148"/> <source>TIFF File (*.tiff)</source> <translation>TIFF-Datei (*.tiff)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="145"/> + <location filename="../IconEditor/IconEditorWindow.py" line="149"/> <source>WAP Bitmap File (*.wbmp)</source> <translation>WAP-Bitmap-Datei (*.wbmp)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1238"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1243"/> <source>eric6 Icon Editor</source> <translation>eric6 Icon-Editor</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1328"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1333"/> <source>About eric6 Icon Editor</source> <translation>Über den eric6 Icon-Editor</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1328"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1333"/> <source>The eric6 Icon Editor is a simple editor component to perform icon drawing tasks.</source> <translation>Der eric6 Icon-Editor ist ein Komponente zur Ausführung einfacher Icon-Bearbeitungsfunktionen.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="290"/> + <location filename="../IconEditor/IconEditorWindow.py" line="295"/> <source>Close Others</source> <translation>Andere schließen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="294"/> + <location filename="../IconEditor/IconEditorWindow.py" line="299"/> <source>Close all other icon editor windows</source> <translation>Schließt alle anderen Icon-Editor Fenster</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="296"/> + <location filename="../IconEditor/IconEditorWindow.py" line="301"/> <source><b>Close Others</b><p>Closes all other icon editor windows.</p></source> <translation><b>Andere schließen</b><p>Dies schließt alle anderen Icon-Editor Fenster.</p></translation> </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="150"/> + <source>WebP Image File (*.webp)</source> + <translation>WebP Bild-Datei (*.webp)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="128"/> + <source>Windows Cursor File (*.cur)</source> + <translation>Windows Zeiger-Datei (*.cur)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="129"/> + <source>DirectDraw-Surface File (*.dds)</source> + <translation>DirectDraw Oberflächendatei (*.dds)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="131"/> + <source>Apple Icon File (*.icns)</source> + <translation>Apple Icon-Datei (*.icns)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="133"/> + <source>JPEG2000 File (*.jp2)</source> + <translation>JPEG2000-Datei (*.jp2)</translation> + </message> </context> <context> <name>IconSizeDialog</name> @@ -31208,6 +31197,189 @@ </message> </context> <context> + <name>ImageMarkupDialog</name> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="53"/> + <source>Windows Bitmap File (*.bmp)</source> + <translation>Windows Bitmap-Datei (*.bmp)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="54"/> + <source>Windows Cursor File (*.cur)</source> + <translation>Windows Zeiger-Datei (*.cur)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="55"/> + <source>DirectDraw-Surface File (*.dds)</source> + <translation>DirectDraw Oberflächendatei (*.dds)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="56"/> + <source>Graphic Interchange Format File (*.gif)</source> + <translation>Graphic-Interchange-Format-Datei (*.gif)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="57"/> + <source>Apple Icon File (*.icns)</source> + <translation>Apple Icon-Datei (*.icns)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="58"/> + <source>Windows Icon File (*.ico)</source> + <translation>Windows Icon-Datei (*.ico)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="59"/> + <source>JPEG2000 File (*.jp2)</source> + <translation>JPEG2000-Datei (*.jp2)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="60"/> + <source>JPEG File (*.jpg)</source> + <translation>JPEG-Datei (*.jpg)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="61"/> + <source>JPEG File (*.jpeg)</source> + <translation>JPEG-Datei (*.jpeg)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="62"/> + <source>Multiple-Image Network Graphics File (*.mng)</source> + <translation>Multiple-Image-Network-Graphics-Datei (*.mng)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="63"/> + <source>Portable Bitmap File (*.pbm)</source> + <translation>Portable-Bitmap-Datei (*.pbm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="64"/> + <source>Paintbrush Bitmap File (*.pcx)</source> + <translation>Paintbrush-Bitmap-Datei (*.pcx)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="65"/> + <source>Portable Graymap File (*.pgm)</source> + <translation>Portable-Graymap-Datei (*.pgm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="66"/> + <source>Portable Network Graphics File (*.png)</source> + <translation>Portable-Network-Graphics-Datei (*.png)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="67"/> + <source>Portable Pixmap File (*.ppm)</source> + <translation>Portable-Pixmap-Datei (*.ppm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="68"/> + <source>Silicon Graphics Image File (*.sgi)</source> + <translation>Silicon-Graphics-Bild-Datei (*.sgi)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="69"/> + <source>Scalable Vector Graphics File (*.svg)</source> + <translation>Scalable-Vector-Graphics-Datei (*.svg)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="70"/> + <source>Compressed Scalable Vector Graphics File (*.svgz)</source> + <translation>Komprimierte Scalable-Vector-Graphics-Datei (*.svgz)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="72"/> + <source>Targa Graphic File (*.tga)</source> + <translation>Targa-Grafik-Datei (*.tga)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="73"/> + <source>TIFF File (*.tif)</source> + <translation>TIFF-Datei (*.tif)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="74"/> + <source>TIFF File (*.tiff)</source> + <translation>TIFF-Datei (*.tiff)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="75"/> + <source>WAP Bitmap File (*.wbmp)</source> + <translation>WAP Bitmap-Datei (*.wbmp)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="76"/> + <source>WebP Image File (*.webp)</source> + <translation>WebP Bild-Datei (*.webp)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="77"/> + <source>X11 Bitmap File (*.xbm)</source> + <translation>X11 Bitmap-Datei (*.xbm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="78"/> + <source>X11 Pixmap File (*.xpm)</source> + <translation>X11 Pixmap-Datei (*.xpm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="89"/> + <source>All Files (*)</source> + <translation>Alle Dateien (*)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="14"/> + <source>Add Image</source> + <translation>Grafik hinzufügen</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="25"/> + <source>Image Address:</source> + <translation>Grafikadresse:</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="41"/> + <source>Enter the image path or URL</source> + <translation>Gib den Pfad oder die URL zur Grafil ein</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="48"/> + <source>Title:</source> + <translation>Titel:</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="58"/> + <source>Alternative Text:</source> + <translation>Alternativer Text:</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="73"/> + <source>Keep Original Size</source> + <translation>Originalgröße beibehalten</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="80"/> + <source>Keep Aspect Ratio</source> + <translation>Größenverhältnis beibehalten</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="89"/> + <source>Width:</source> + <translation>Breite:</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="119"/> + <source> px</source> + <translation> px</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="109"/> + <source>Height:</source> + <translation>Höhe:</translation> + </message> +</context> +<context> <name>ImagesIcon</name> <message> <location filename="../WebBrowser/StatusBar/ImagesIcon.py" line="40"/> @@ -34072,7 +34244,7 @@ <translation>Wähle den zuzuordnenden alternativen Lexer</translation> </message> <message> - <location filename="../Project/LexerAssociationDialog.py" line="131"/> + <location filename="../Project/LexerAssociationDialog.py" line="134"/> <source>Alternative</source> <translation>Alternative</translation> </message> @@ -34408,317 +34580,317 @@ <translation>Makefile</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="117"/> + <location filename="../QScintilla/Lexers/__init__.py" line="121"/> <source>Perl</source> <translation>Perl</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="121"/> + <location filename="../QScintilla/Lexers/__init__.py" line="125"/> <source>Povray</source> <translation>Povray</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="123"/> + <location filename="../QScintilla/Lexers/__init__.py" line="127"/> <source>Properties</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="131"/> + <location filename="../QScintilla/Lexers/__init__.py" line="135"/> <source>Ruby</source> <translation>Ruby</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="133"/> - <source>SQL</source> - <translation>SQL</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="137"/> + <source>SQL</source> + <translation>SQL</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="141"/> <source>TeX</source> <translation>TeX</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="139"/> + <location filename="../QScintilla/Lexers/__init__.py" line="143"/> <source>VHDL</source> <translation>VHDL</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="547"/> + <location filename="../QScintilla/Lexers/__init__.py" line="565"/> <source>Pyrex Files (*.pyx)</source> <translation>Pyrex-Dateien (*.pyx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="550"/> - <source>Quixote Template Files (*.ptl)</source> - <translation>Quixote-Templatedateien (*.ptl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="553"/> - <source>Ruby Files (*.rb)</source> - <translation>Ruby-Dateien (*.rb)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="556"/> - <source>IDL Files (*.idl)</source> - <translation>IDL-Dateien (*.idl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="383"/> - <source>C Files (*.h *.c)</source> - <translation>C-Dateien (*.h *.c)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="386"/> - <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> - <translation>C++-Dateien (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="568"/> + <source>Quixote Template Files (*.ptl)</source> + <translation>Quixote-Templatedateien (*.ptl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="571"/> + <source>Ruby Files (*.rb)</source> + <translation>Ruby-Dateien (*.rb)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="574"/> + <source>IDL Files (*.idl)</source> + <translation>IDL-Dateien (*.idl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="393"/> + <source>C Files (*.h *.c)</source> + <translation>C-Dateien (*.h *.c)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="396"/> + <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> + <translation>C++-Dateien (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="586"/> <source>C# Files (*.cs)</source> <translation>C#-Dateien (*.cs)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="392"/> + <location filename="../QScintilla/Lexers/__init__.py" line="402"/> <source>HTML Files (*.html *.htm *.asp *.shtml)</source> <translation>HTML-Dateien (*.html *.htm *.asp *.shtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="580"/> + <location filename="../QScintilla/Lexers/__init__.py" line="598"/> <source>CSS Files (*.css)</source> <translation>CSS-Dateien (*.css)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="583"/> + <location filename="../QScintilla/Lexers/__init__.py" line="601"/> <source>QSS Files (*.qss)</source> <translation>QSS-Dateien (*.qss)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="401"/> + <location filename="../QScintilla/Lexers/__init__.py" line="411"/> <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> <translation>PHP-Dateien (*.php *.php3 *.php4 *.php5 *.phtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="595"/> - <source>Qt Resource Files (*.qrc)</source> - <translation>Qt-Ressourcendateien (*.qrc)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="410"/> - <source>D Files (*.d *.di)</source> - <translation>D-Dateien (*.d *.di)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="604"/> - <source>Java Files (*.java)</source> - <translation>Java-Dateien (*.java)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="607"/> - <source>JavaScript Files (*.js)</source> - <translation>JavaScript-Dateien (*.js)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="610"/> - <source>SQL Files (*.sql)</source> - <translation>SQL-Dateien (*.sql)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="613"/> - <source>Docbook Files (*.docbook)</source> - <translation>Docbook-Dateien (*.docbook)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="425"/> - <source>Perl Files (*.pl *.pm *.ph)</source> - <translation>Perl-Dateien (*.pl *,pm *.ph)</translation> + <source>Qt Resource Files (*.qrc)</source> + <translation>Qt-Ressourcendateien (*.qrc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="420"/> + <source>D Files (*.d *.di)</source> + <translation>D-Dateien (*.d *.di)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="622"/> - <source>Lua Files (*.lua)</source> - <translation>Lua-Dateien (*.lua)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="431"/> - <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> - <translation>TeX-Dateien (*.tex *.sty *.aux *.toc *.idx)</translation> + <source>Java Files (*.java)</source> + <translation>Java-Dateien (*.java)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="625"/> + <source>JavaScript Files (*.js)</source> + <translation>JavaScript-Dateien (*.js)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="628"/> + <source>SQL Files (*.sql)</source> + <translation>SQL-Dateien (*.sql)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="631"/> + <source>Docbook Files (*.docbook)</source> + <translation>Docbook-Dateien (*.docbook)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="435"/> + <source>Perl Files (*.pl *.pm *.ph)</source> + <translation>Perl-Dateien (*.pl *,pm *.ph)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="640"/> + <source>Lua Files (*.lua)</source> + <translation>Lua-Dateien (*.lua)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="441"/> + <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> + <translation>TeX-Dateien (*.tex *.sty *.aux *.toc *.idx)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="643"/> <source>Shell Files (*.sh)</source> <translation>Shell dateien (*.sh)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="437"/> + <location filename="../QScintilla/Lexers/__init__.py" line="447"/> <source>Batch Files (*.bat *.cmd)</source> <translation>Batch-Dateien (*.bat *.cmd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="440"/> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> <source>Diff Files (*.diff *.patch)</source> <translation>Diff-Dateien (*.diff *.patch)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="443"/> - <source>Makefiles (*.mak)</source> - <translation>Make-Dateien (*.mak)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="446"/> - <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> - <translation>Properties-Dateien (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="649"/> - <source>Povray Files (*.pov)</source> - <translation>Povray-Dateien (*.pov)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="453"/> - <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> - <translation>CMakeDateien (CMakeLists.txt *.cmake *.ctest)</translation> + <source>Makefiles (*.mak)</source> + <translation>Make-Dateien (*.mak)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="456"/> + <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> + <translation>Properties-Dateien (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="667"/> + <source>Povray Files (*.pov)</source> + <translation>Povray-Dateien (*.pov)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="463"/> + <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> + <translation>CMakeDateien (CMakeLists.txt *.cmake *.ctest)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="466"/> <source>VHDL Files (*.vhd *.vhdl)</source> <translation>VHDLDateien (*.vhd *.vhdl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="718"/> + <location filename="../QScintilla/Lexers/__init__.py" line="744"/> <source>All Files (*)</source> <translation>Alle Dateien (*)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="135"/> + <location filename="../QScintilla/Lexers/__init__.py" line="139"/> <source>TCL</source> <translation>TCL</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="459"/> + <location filename="../QScintilla/Lexers/__init__.py" line="469"/> <source>TCL/Tk Files (*.tcl *.tk)</source> <translation>TCL-/Tk-Dateien (*.tcl *.tk)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="559"/> - <source>C Files (*.c)</source> - <translation>C-Dateien (*.c)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="562"/> - <source>C++ Files (*.cpp)</source> - <translation>C++-Dateien (*.cpp)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="565"/> - <source>C++/C Header Files (*.h)</source> - <translation>C++-/C-Header Dateien (*.h)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="571"/> - <source>HTML Files (*.html)</source> - <translation>HTML-Dateien (*.html)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="574"/> - <source>PHP Files (*.php)</source> - <translation>PHP-Dateien (*.php)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="577"/> - <source>ASP Files (*.asp)</source> - <translation>ASP-Dateien (*.asp)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="586"/> - <source>XML Files (*.xml)</source> - <translation>XML-Dateien (*.xml)</translation> + <source>C Files (*.c)</source> + <translation>C-Dateien (*.c)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="580"/> + <source>C++ Files (*.cpp)</source> + <translation>C++-Dateien (*.cpp)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="583"/> + <source>C++/C Header Files (*.h)</source> + <translation>C++-/C-Header Dateien (*.h)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="589"/> - <source>XSL Files (*.xsl)</source> - <translation>XSL-Dateien (*.xsl)</translation> + <source>HTML Files (*.html)</source> + <translation>HTML-Dateien (*.html)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="592"/> + <source>PHP Files (*.php)</source> + <translation>PHP-Dateien (*.php)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="595"/> + <source>ASP Files (*.asp)</source> + <translation>ASP-Dateien (*.asp)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="604"/> + <source>XML Files (*.xml)</source> + <translation>XML-Dateien (*.xml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="607"/> + <source>XSL Files (*.xsl)</source> + <translation>XSL-Dateien (*.xsl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="610"/> <source>DTD Files (*.dtd)</source> <translation>DTD-Dateien (*.dtd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="598"/> - <source>D Files (*.d)</source> - <translation>D-Dateien (*.d)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="601"/> - <source>D Interface Files (*.di)</source> - <translation>D-Interfacedateien (*.di)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="616"/> - <source>Perl Files (*.pl)</source> - <translation>Perl-Dateien (*.pl)</translation> + <source>D Files (*.d)</source> + <translation>D-Dateien (*.d)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="619"/> - <source>Perl Module Files (*.pm)</source> - <translation>Perl-Moduldateien (*.pm)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="628"/> - <source>Batch Files (*.bat)</source> - <translation>Batch-Dateien (*.bat)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="631"/> - <source>TeX Files (*.tex)</source> - <translation>TeX-Dateien (*.tex)</translation> + <source>D Interface Files (*.di)</source> + <translation>D-Interfacedateien (*.di)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="634"/> - <source>TeX Template Files (*.sty)</source> - <translation>TeX-Templatedateien (*.sty)</translation> + <source>Perl Files (*.pl)</source> + <translation>Perl-Dateien (*.pl)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="637"/> - <source>Diff Files (*.diff)</source> - <translation>Diff-Dateien (*.diff)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="640"/> - <source>Make Files (*.mak)</source> - <translation>Make-Dateien (*.mak)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="643"/> - <source>Properties Files (*.ini)</source> - <translation>Properties-Dateien (*.ini)</translation> + <source>Perl Module Files (*.pm)</source> + <translation>Perl-Moduldateien (*.pm)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="646"/> - <source>Configuration Files (*.cfg)</source> - <translation>Konfigurationsdateien (*.cfg)</translation> + <source>Batch Files (*.bat)</source> + <translation>Batch-Dateien (*.bat)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="649"/> + <source>TeX Files (*.tex)</source> + <translation>TeX-Dateien (*.tex)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="652"/> - <source>CMake Files (CMakeLists.txt)</source> - <translation>CMake-Dateien (CMakeLists.txt)</translation> + <source>TeX Template Files (*.sty)</source> + <translation>TeX-Templatedateien (*.sty)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="655"/> - <source>CMake Macro Files (*.cmake)</source> - <translation>CMake-Makrodateien (*.cmake)</translation> + <source>Diff Files (*.diff)</source> + <translation>Diff-Dateien (*.diff)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="658"/> - <source>VHDL Files (*.vhd)</source> - <translation>VHDL-Dateien (*.vhd)</translation> + <source>Make Files (*.mak)</source> + <translation>Make-Dateien (*.mak)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="661"/> - <source>TCL Files (*.tcl)</source> - <translation>TCL-Dateien (*.tcl)</translation> + <source>Properties Files (*.ini)</source> + <translation>Properties-Dateien (*.ini)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="664"/> + <source>Configuration Files (*.cfg)</source> + <translation>Konfigurationsdateien (*.cfg)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="670"/> + <source>CMake Files (CMakeLists.txt)</source> + <translation>CMake-Dateien (CMakeLists.txt)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="673"/> + <source>CMake Macro Files (*.cmake)</source> + <translation>CMake-Makrodateien (*.cmake)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="676"/> + <source>VHDL Files (*.vhd)</source> + <translation>VHDL-Dateien (*.vhd)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="679"/> + <source>TCL Files (*.tcl)</source> + <translation>TCL-Dateien (*.tcl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="682"/> <source>Tk Files (*.tk)</source> <translation>Tk-Dateien (*.tk)</translation> </message> @@ -34733,175 +34905,195 @@ <translation>Fortran77</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="115"/> + <location filename="../QScintilla/Lexers/__init__.py" line="119"/> <source>Pascal</source> <translation>Pascal</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="462"/> + <location filename="../QScintilla/Lexers/__init__.py" line="472"/> <source>Fortran Files (*.f90 *.f95 *.f2k)</source> <translation>Fortran-Dateien (*.f90 *.f95 *.f2k)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="465"/> + <location filename="../QScintilla/Lexers/__init__.py" line="475"/> <source>Fortran77 Files (*.f *.for)</source> <translation>Fortran77-Dateien (*.f *.for)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="468"/> + <location filename="../QScintilla/Lexers/__init__.py" line="478"/> <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> <translation>Pascal-Dateien (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="667"/> - <source>Fortran Files (*.f95)</source> - <translation>Fortran-Dateien (*.f95)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="670"/> - <source>Fortran77 Files (*.f)</source> - <translation>Fortran77-Dateien (*.f)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="673"/> - <source>Pascal Files (*.pas)</source> - <translation>Pascal-Dateien (*.pas)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="119"/> - <source>PostScript</source> - <translation>PostScript</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="141"/> - <source>XML</source> - <translation>XML</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="143"/> - <source>YAML</source> - <translation>YAML</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="404"/> - <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> - <translation>XML-Dateien (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="676"/> - <source>PostScript Files (*.ps)</source> - <translation>PostScript-Dateien (*.ps)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="474"/> - <source>YAML Files (*.yaml *.yml)</source> - <translation>YAML-Dateien (*.yaml *.yml)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="679"/> - <source>YAML Files (*.yml)</source> - <translation>YAML-Dateien (*.yml)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="171"/> - <source>Pygments</source> - <translation>Pygments</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="365"/> - <source>Python Files (*.py *.py2 *.py3)</source> - <translation>Python-Dateien (*.py *.py2 *.py3)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="368"/> - <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> - <translation>Python-GUI-Dateien (*.pyw *.pyw2 *.pyw3)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="538"/> - <source>Python3 Files (*.py)</source> - <translation>Python 3-Dateien (*.py)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="544"/> - <source>Python3 GUI Files (*.pyw)</source> - <translation>Python 3-GUI-Dateien (*.pyw)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="535"/> - <source>Python2 Files (*.py2)</source> - <translation>Python 2-Dateien (*.py2)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="541"/> - <source>Python2 GUI Files (*.pyw2)</source> - <translation>Python 2-GUI-Dateien (*.pyw2)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="125"/> - <source>Python2</source> - <translation>Python 2</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="127"/> - <source>Python3</source> - <translation>Python 3</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="148"/> - <source>Matlab</source> - <translation>Matlab</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="148"/> - <source>Octave</source> - <translation>Octave</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="480"/> - <source>Matlab Files (*.m *.m.matlab)</source> - <translation>Matlab-Dateien (*.m *.m.matlab)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="685"/> - <source>Matlab Files (*.m)</source> - <translation>Matlab-Dateien (*.m)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="685"/> - <source>Octave Files (*.m.octave)</source> - <translation>Octave-Dateien (*.m.octave)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="480"/> - <source>Octave Files (*.m *.m.octave)</source> - <translation>Octave-Dateien (*.m *.m.octave)</translation> + <source>Fortran Files (*.f95)</source> + <translation>Fortran-Dateien (*.f95)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="688"/> + <source>Fortran77 Files (*.f)</source> + <translation>Fortran77-Dateien (*.f)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="691"/> + <source>Pascal Files (*.pas)</source> + <translation>Pascal-Dateien (*.pas)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="123"/> + <source>PostScript</source> + <translation>PostScript</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="145"/> + <source>XML</source> + <translation>XML</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="147"/> + <source>YAML</source> + <translation>YAML</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="414"/> + <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> + <translation>XML-Dateien (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="694"/> + <source>PostScript Files (*.ps)</source> + <translation>PostScript-Dateien (*.ps)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="484"/> + <source>YAML Files (*.yaml *.yml)</source> + <translation>YAML-Dateien (*.yaml *.yml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="697"/> + <source>YAML Files (*.yml)</source> + <translation>YAML-Dateien (*.yml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="175"/> + <source>Pygments</source> + <translation>Pygments</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="375"/> + <source>Python Files (*.py *.py2 *.py3)</source> + <translation>Python-Dateien (*.py *.py2 *.py3)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="378"/> + <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> + <translation>Python-GUI-Dateien (*.pyw *.pyw2 *.pyw3)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="556"/> + <source>Python3 Files (*.py)</source> + <translation>Python 3-Dateien (*.py)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="562"/> + <source>Python3 GUI Files (*.pyw)</source> + <translation>Python 3-GUI-Dateien (*.pyw)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="553"/> + <source>Python2 Files (*.py2)</source> + <translation>Python 2-Dateien (*.py2)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="559"/> + <source>Python2 GUI Files (*.pyw2)</source> + <translation>Python 2-GUI-Dateien (*.pyw2)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="129"/> + <source>Python2</source> + <translation>Python 2</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="131"/> + <source>Python3</source> + <translation>Python 3</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="115"/> + <source>Matlab</source> + <translation>Matlab</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="117"/> + <source>Octave</source> + <translation>Octave</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="487"/> + <source>Matlab Files (*.m *.m.matlab)</source> + <translation>Matlab-Dateien (*.m *.m.matlab)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="700"/> + <source>Matlab Files (*.m)</source> + <translation>Matlab-Dateien (*.m)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="703"/> + <source>Octave Files (*.m.octave)</source> + <translation>Octave-Dateien (*.m.octave)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="490"/> + <source>Octave Files (*.m *.m.octave)</source> + <translation>Octave-Dateien (*.m *.m.octave)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="133"/> <source>QSS</source> <translation>QSS</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="157"/> + <location filename="../QScintilla/Lexers/__init__.py" line="153"/> <source>Gettext</source> <translation>Gettext</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="695"/> + <location filename="../QScintilla/Lexers/__init__.py" line="709"/> <source>Gettext Files (*.po)</source> <translation>Gettext-Dateien (*.po)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="162"/> + <location filename="../QScintilla/Lexers/__init__.py" line="158"/> <source>CoffeeScript</source> <translation>CoffeeScript</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="702"/> + <location filename="../QScintilla/Lexers/__init__.py" line="716"/> <source>CoffeeScript Files (*.coffee)</source> <translation>CoffeeScript Dateien (*.coffee)</translation> </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="163"/> + <source>JSON</source> + <translation>JSON</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="723"/> + <source>JSON Files (*.json)</source> + <translation>JSON-Dateien (*.json)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="166"/> + <source>Markdown</source> + <translation>Markdown</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="728"/> + <source>Markdown Files (*.md)</source> + <translation>Markdown Dateien (*.md)</translation> + </message> </context> <context> <name>LfConvertDataDialog</name> @@ -35114,6 +35306,19 @@ </message> </context> <context> + <name>MarkdownProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/MarkdownProvider.py" line="383"/> + <source>Create List</source> + <translation>Liste erzeugen</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/MarkdownProvider.py" line="383"/> + <source>Enter desired number of list elements:</source> + <translation>Gib die vorgesehene Anzahl Listenelemente ein:</translation> + </message> +</context> +<context> <name>MasterPasswordEntryDialog</name> <message> <location filename="../Preferences/ConfigurationPages/MasterPasswordEntryDialog.ui" line="14"/> @@ -35189,12 +35394,12 @@ <context> <name>McCabeChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="423"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="426"/> <source>'{0}' is too complex ({1})</source> <translation>'{0}' ist zu komplex ({1})</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="425"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="428"/> <source>{0}: {1}</source> <translation>{0}: {1}</translation> </message> @@ -35222,126 +35427,111 @@ <translation>Gib die Anzahl anzuzeigender Log Meldungen ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="155"/> <source>Commit</source> <translation>Einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="161"/> <source>No. of commit messages to remember:</source> <translation>Anzahl zu speichernder Änderungsmeldungen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="168"/> <source>Enter the number of commit messages to remember</source> <translation>Gib die Anzahl zu speichernder Änderungsmeldungen ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="216"/> - <source>Incoming / Outgoing</source> - <translation>Eingang / Ausgang</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="222"/> - <source>Select to show the incoming and outgoing log in a log browser dialog</source> - <translation>Auswählen, um das eingehende und ausgehende Log in einem Log Browser anzuzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="225"/> - <source>Use Log Browser for incoming / outgoing log</source> - <translation>Log Browser für eingehendes / ausgehendes Log verwenden</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="235"/> - <source>Pull</source> - <translation>Pull</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="242"/> <source>Select to update the working directory to new tip</source> <translation>Auswählen, um das Arbeitsverzeichnis auf die neue Spitze zu aktualisieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="236"/> + <source>Pull</source> + <translation>Pull</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="245"/> <source>Update after pulling</source> <translation>Nach Pull aktualisieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="334"/> <source>Edit the Mercurial configuration file</source> <translation>Editiere die Mercurial-Konfigurationsdatei</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="337"/> <source>Edit configuration file</source> <translation>Konfigurationsdatei editieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="311"/> <source>Cleanup</source> <translation>Aufräumen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="317"/> <source>Pattern:</source> <translation>Muster:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="324"/> <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> <translation>Gib die Dateinamenmuster für das Aufräumen ein (Einträge durch Leerzeichen getrennt)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="252"/> <source>Select to prefer unbundle over pull</source> <translation>Auswählen, um Unbundle einem Pull vorzuziehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="255"/> <source><b>Prefer Unbundle</b> <p>If this option is selected, it will be checked, if a Mercurial changegroups file from a previous "Show Incoming" request exists. In this case it will be applied and deleted. Otherwise a pull request will be sent.</p></source> <translation><b>Unbundle vorziehen</b> <p>Wenn diese Option ausgewählt ist, wird überprüft, ob eine Mercurial-Änderungsgruppendatei einer vorherigen „Zeige eingehendes Log“-Anfrage existiert. In diesem Fall wird sie angewendet und gelöscht. Anderenfalls wird eine Pull-Anfrage gesendet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="259"/> <source>Prefer Unbundle</source> <translation>Unbundle vorziehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="292"/> <source>Revert</source> <translation>Rückgängig machen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="298"/> <source>Select to create a backup file (.orig) before reverting changes</source> <translation>Auswählen, um eine Sicherungsdatei (.orig) vor dem Rückgängigmachen zu erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="301"/> <source>Create Backup Files</source> <translation>Sicherungsdateien erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="269"/> <source>Merge</source> <translation>Änderungen zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="275"/> <source>Select to enforce usage of the Mercural internal merge tool</source> <translation>Auswählen, um die Verwendung des Mercurial internen Merge Werkzeuges zu erzwingen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="278"/> <source><b>Internal Merge Tool</b> <p>Select to enforce usage of the Mercural internal merge tool,which leaves conflict markers in the file in case of conflicting changes.</p></source> <translation><b>Internes Merge Werkzeug</b> <p>Auswählen, um die Verwendung des Mercurial internen Merge Werkzeuges, das im Falle von widersprüchlichen Änderung Markierungen in der Datei hinterlässt, zu erzwingen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="282"/> <source>Use internal merge with conflict markers</source> <translation>Internes Merge mit Konfliktmarken verwenden</translation> </message> @@ -35376,15 +35566,25 @@ <translation>Versteckte Änderungssätze einschließen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="197"/> <source>No. of commit authors to remember:</source> <translation>Anzahl zu speichernder Autorennamen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="204"/> <source>Enter the number of commit authors to remember</source> <translation>Gib die Anzahl zu speichernder Autorennamen ein</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="132"/> + <source>No. of message characters shown in list:</source> + <translation>Anzahl in der Log Liste anzuzeigender Nachrichtenzeichen:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="139"/> + <source>Enter the number of characters of the commit message to be shown in the list</source> + <translation>Gib die Anzahl der in der Log Liste anzuzeigender Zeichen der Lognachricht ein</translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -36343,107 +36543,107 @@ <context> <name>MiscellaneousChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="429"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="432"/> <source>coding magic comment not found</source> <translation>Kodierungskommentar nicht gefunden</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="432"/> - <source>unknown encoding ({0}) found in coding magic comment</source> - <translation>Unzulässige Kodierung ({0}) im Kodierungskommentar gefunden</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="435"/> - <source>copyright notice not present</source> - <translation>Copyrightvermerk nicht gefunden</translation> + <source>unknown encoding ({0}) found in coding magic comment</source> + <translation>Unzulässige Kodierung ({0}) im Kodierungskommentar gefunden</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="438"/> - <source>copyright notice contains invalid author</source> - <translation>Copyrightvermerk enthält ungültigen Autor</translation> + <source>copyright notice not present</source> + <translation>Copyrightvermerk nicht gefunden</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="441"/> - <source>blind except: statement</source> - <translation>Allgemeines Except: Statement</translation> + <source>copyright notice contains invalid author</source> + <translation>Copyrightvermerk enthält ungültigen Autor</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="444"/> - <source>found {0} formatter</source> - <translation>{0} Format gefunden</translation> + <source>blind except: statement</source> + <translation>Allgemeines Except: Statement</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="447"/> - <source>format string does contain unindexed parameters</source> - <translation>Formatstring enthält nicht indizierte Parameter</translation> + <source>found {0} formatter</source> + <translation>{0} Format gefunden</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="450"/> - <source>docstring does contain unindexed parameters</source> - <translation>Dokumentationsstring enthält nicht indizierte Parameter</translation> + <source>format string does contain unindexed parameters</source> + <translation>Formatstring enthält nicht indizierte Parameter</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="453"/> - <source>other string does contain unindexed parameters</source> - <translation>Anderer String enthält nicht indizierte Parameter</translation> + <source>docstring does contain unindexed parameters</source> + <translation>Dokumentationsstring enthält nicht indizierte Parameter</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="456"/> - <source>format call uses too large index ({0})</source> - <translation>Format Aufruf enthält zu großen Index ({0})</translation> + <source>other string does contain unindexed parameters</source> + <translation>Anderer String enthält nicht indizierte Parameter</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="459"/> - <source>format call uses missing keyword ({0})</source> - <translation>Format Aufruf verwendet fehlendes Schlüsselwort ({0})</translation> + <source>format call uses too large index ({0})</source> + <translation>Format Aufruf enthält zu großen Index ({0})</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="462"/> - <source>format call uses keyword arguments but no named entries</source> - <translation>Format Aufruf verwendet Schlüsselwort Argumente, enthält aber keine benannten Einträge</translation> + <source>format call uses missing keyword ({0})</source> + <translation>Format Aufruf verwendet fehlendes Schlüsselwort ({0})</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="465"/> - <source>format call uses variable arguments but no numbered entries</source> - <translation>Format Aufruf verwendet variable argumente, enthält aber keine nummerierten Einträge</translation> + <source>format call uses keyword arguments but no named entries</source> + <translation>Format Aufruf verwendet Schlüsselwort Argumente, enthält aber keine benannten Einträge</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="468"/> - <source>format call uses implicit and explicit indexes together</source> - <translation>Format Aufruf verwendet sowohl implizite als auch explizite Indizes</translation> + <source>format call uses variable arguments but no numbered entries</source> + <translation>Format Aufruf verwendet variable argumente, enthält aber keine nummerierten Einträge</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="471"/> - <source>format call provides unused index ({0})</source> - <translation>Format Aufruf verwendet ungenutzten Index ({0})</translation> + <source>format call uses implicit and explicit indexes together</source> + <translation>Format Aufruf verwendet sowohl implizite als auch explizite Indizes</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="474"/> - <source>format call provides unused keyword ({0})</source> - <translation>Format Aufruf verwendet ungenutztes Schlüsselwort ({0})</translation> + <source>format call provides unused index ({0})</source> + <translation>Format Aufruf verwendet ungenutzten Index ({0})</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="477"/> - <source>expected these __future__ imports: {0}; but only got: {1}</source> - <translation>erwartete __future__ Imports: {0}; aber nur {1} gefunden</translation> + <source>format call provides unused keyword ({0})</source> + <translation>Format Aufruf verwendet ungenutztes Schlüsselwort ({0})</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="480"/> - <source>expected these __future__ imports: {0}; but got none</source> - <translation>erwartete __future__ Imports: {0}; jedoch keine gefunden</translation> + <source>expected these __future__ imports: {0}; but only got: {1}</source> + <translation>erwartete __future__ Imports: {0}; aber nur {1} gefunden</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="483"/> - <source>print statement found</source> - <translation>print Statement gefunden</translation> + <source>expected these __future__ imports: {0}; but got none</source> + <translation>erwartete __future__ Imports: {0}; jedoch keine gefunden</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="486"/> - <source>one element tuple found</source> - <translation>Tuple mit einem Element gefunden</translation> + <source>print statement found</source> + <translation>print Statement gefunden</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="489"/> + <source>one element tuple found</source> + <translation>Tuple mit einem Element gefunden</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="492"/> <source>{0}: {1}</source> <translation>{0}: {1}</translation> </message> @@ -36836,72 +37036,72 @@ <context> <name>NamingStyleChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="378"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> <source>class names should use CapWords convention</source> <translation>Klassennamen sollten die 'CapWords' Konvention verwenden</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> - <source>function name should be lowercase</source> - <translation>Funktionsname sollte klein geschrieben sein</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="384"/> - <source>argument name should be lowercase</source> - <translation>Argumentname sollte klein geschrieben sein</translation> + <source>function name should be lowercase</source> + <translation>Funktionsname sollte klein geschrieben sein</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="387"/> - <source>first argument of a class method should be named 'cls'</source> - <translation>Das erste Argument einer Klassenmethode sollte 'cls' sein</translation> + <source>argument name should be lowercase</source> + <translation>Argumentname sollte klein geschrieben sein</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="390"/> - <source>first argument of a method should be named 'self'</source> - <translation>Das erste Argument einer Methode sollte 'self' sein</translation> + <source>first argument of a class method should be named 'cls'</source> + <translation>Das erste Argument einer Klassenmethode sollte 'cls' sein</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="393"/> + <source>first argument of a method should be named 'self'</source> + <translation>Das erste Argument einer Methode sollte 'self' sein</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="396"/> <source>first argument of a static method should not be named 'self' or 'cls</source> <translation>Das erste Argument einer statischen Methode sollte nicht 'self' oder 'cls' sein</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="397"/> - <source>module names should be lowercase</source> - <translation>Modulnamen sollten klein geschrieben sein</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="400"/> - <source>package names should be lowercase</source> - <translation>Paketnamen sollten klein geschrieben sein</translation> + <source>module names should be lowercase</source> + <translation>Modulnamen sollten klein geschrieben sein</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="403"/> - <source>constant imported as non constant</source> - <translation>Konstante als Nicht-Konstante importiert</translation> + <source>package names should be lowercase</source> + <translation>Paketnamen sollten klein geschrieben sein</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="406"/> - <source>lowercase imported as non lowercase</source> - <translation>klein geschriebener Bezeichner als nicht klein geschriebener importiert</translation> + <source>constant imported as non constant</source> + <translation>Konstante als Nicht-Konstante importiert</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="409"/> - <source>camelcase imported as lowercase</source> - <translation>groß/klein geschriebener Bezeichner als klein geschriebener importiert</translation> + <source>lowercase imported as non lowercase</source> + <translation>klein geschriebener Bezeichner als nicht klein geschriebener importiert</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="412"/> - <source>camelcase imported as constant</source> - <translation>groß/klein geschriebener Bezeichner als Konstante importiert</translation> + <source>camelcase imported as lowercase</source> + <translation>groß/klein geschriebener Bezeichner als klein geschriebener importiert</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="415"/> - <source>variable in function should be lowercase</source> - <translation>Variablen in Funktionen sollte klein geschrieben sein</translation> + <source>camelcase imported as constant</source> + <translation>groß/klein geschriebener Bezeichner als Konstante importiert</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="418"/> + <source>variable in function should be lowercase</source> + <translation>Variablen in Funktionen sollte klein geschrieben sein</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="421"/> <source>names 'l', 'O' and 'I' should be avoided</source> <translation>Namen 'l', 'O' und 'I' sollten vermieden werden</translation> </message> @@ -39281,27 +39481,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1525"/> + <location filename="../Preferences/__init__.py" line="1530"/> <source>Export Preferences</source> <translation>Einstellungen exportieren</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1553"/> + <location filename="../Preferences/__init__.py" line="1558"/> <source>Import Preferences</source> <translation>Einstellungen importieren</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1553"/> + <location filename="../Preferences/__init__.py" line="1558"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Properties-Dateien (*.ini);;Alle Dateien (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1655"/> + <location filename="../Preferences/__init__.py" line="1660"/> <source>Select Python{0} Interpreter</source> <translation>Wähle den Python{0}-Interpreter</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1655"/> + <location filename="../Preferences/__init__.py" line="1660"/> <source>Select the Python{0} interpreter to be used:</source> <translation>Wähle den zu verwendenden Python{0}-Interpreter aus:</translation> </message> @@ -39327,12 +39527,7 @@ <translation><p>Für diesen Dateityp ist keine Vorschau verfügbar.</p></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="597"/> - <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> - <translation><p>Die Markdown-Vorschau erfordert das <b>python-markdown</b>-Paket.<br/>Installiere es mit dem Paketmanager oder siehe <a href="http://pythonhosted.org/Markdown/install.html">die Installationsanleitung.</a></p></translation> - </message> - <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="572"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="565"/> <source><p>ReStructuredText preview requires the <b>python-docutils</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pypi.python.org/pypi/docutils">this page.</a></p></source> <translation><p>Die ReStructuredText-Vorschau erfordert das <b>python-docutils</b>-Paket.<br/>Installiere es mit dem Paketmanager,'pip install docutils' oder siehe <a href="http://pypi.python.org/pypi/docutils">diese Seite.</a></p></translation> </message> @@ -39341,6 +39536,11 @@ <source><p>ReStructuredText preview requires the <b>sphinx</b> package.<br/>Install it with your package manager,'pip install Sphinx' or see <a href="http://pypi.python.org/pypi/Sphinx">this page.</a></p><p>Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.</p></source> <translation><p>Die ReStructuredText-Vorschau erfordert das <b>sphinx</b>-Paket.<br/>Installiere es mit dem Paketmanager,'pip install Sphinx' oder siehe <a href="http://pypi.python.org/pypi/Sphinx">diese Seite.</a></p><p>Alternativ kann die Verwendung von Sphinx auf der Konfigurationsseite Editor, Dateibehandlung deaktiviert werden.</p></translation> </message> + <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="590"/> + <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> + <translation><p>Die Markdown-Vorschau erfordert das <b>python-markdown</b>-Paket.<br/>Installiere es mit dem Paketmanager, 'pip install docutils' oder siehe <a href="http://pythonhosted.org/Markdown/install.html">die Installationsanleitung.</a></p></translation> + </message> </context> <context> <name>PreviewerHTML</name> @@ -39365,17 +39565,17 @@ <translation>Server Side Includes aktivieren</translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="177"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="179"/> <source><p>No preview available for this type of file.</p></source> <translation><p>Für diesen Dateityp ist keine Vorschau verfügbar.</p></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="225"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="230"/> <source>Preview - {0}</source> <translation>Vorschau – {0}</translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="227"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="232"/> <source>Preview</source> <translation>Vorschau</translation> </message> @@ -43946,521 +44146,501 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/> - <source>Show log</source> - <translation>Beschreibungen anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/> - <source>Show &log</source> - <translation>&Beschreibungen anzeigen</translation> + <source>Show log browser</source> + <translation>Zeige Log-Browser</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> - <source>Show the log of the local project</source> - <translation>Zeigt die Änderungsbeschreibungen des lokalen Projektes an</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation>Zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="107"/> - <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation><b>Beschreibungen anzeigen</b><p>Dies zeigt die Änderungsbeschreibungen (Log) des lokalen Projektes an.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="114"/> - <source>Show log browser</source> - <translation>Zeige Log-Browser</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="119"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>Zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Zeige Log-Browser</b><p>Dies zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen. Zunächst wird nur eine begrenzte Anzahl an Einträgen angezeigt. Weitere können später geholt werden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/> <source>Show differences</source> <translation>Unterschiede anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/> <source>Show &difference</source> <translation>&Unterschiede anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/> <source>Show the difference of the local project to the repository</source> <translation>Zeigt den Unterschied des lokalen Projektes zum Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation><b>Unterschiede anzeigen</b><p>Dies zeigt Unterschiede des lokalen Projektes zum Repository an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="132"/> <source>Show differences (extended)</source> <translation>Unterschiede anzeigen (erweitert)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="137"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Zeigt den Unterschied von Revisionen des Projektes an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="140"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation><b>Unterschiede anzeigen (erweitert)</b><p>Dies zeigt Unterschiede von Revisionen des Projektes an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/> <source>Show differences (URLs)</source> <translation>Unterschiede anzeigen (URLs)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="153"/> <source>Show the difference of the project between two repository URLs</source> <translation>Zeigt den Unterschied des Projektes zwischen zwei Repository-URLs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="156"/> <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> <translation><b>Unterschiede anzeigen (URLs)</b><p>Dies zeigt Unterschiede des Projektes zwischen zwei Repository-URLs.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/> + <source>Show status</source> + <translation>Status anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/> + <source>Show &status</source> + <translation>Status an&zeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> + <source>Show the status of the local project</source> + <translation>Zeige den Status des lokalen Projektes an</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="172"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation><b>Status anzeigen</b><p>Dies zeigt den Status des lokalen Projektes an.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> - <source>Show status</source> - <translation>Status anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> - <source>Show &status</source> - <translation>Status an&zeigen</translation> + <source>Show change lists</source> + <translation>Änderungslisten anzeigen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/> - <source>Show the status of the local project</source> - <translation>Zeige den Status des lokalen Projektes an</translation> + <source>Show the change lists and associated files of the local project</source> + <translation>Zeige die Änderungslisten des lokalen Projektes und die zugehörigen Dateien an</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="187"/> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation><b>Status anzeigen</b><p>Dies zeigt den Status des lokalen Projektes an.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> - <source>Show change lists</source> - <translation>Änderungslisten anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="199"/> - <source>Show the change lists and associated files of the local project</source> - <translation>Zeige die Änderungslisten des lokalen Projektes und die zugehörigen Dateien an</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="202"/> <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> <translation><b>Änderungslisten anzeigen</b><p>Dies zeigt die Änderungslisten des lokalen Projektes und die zugehörigen Dateien an</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> <source>Show repository info</source> <translation>Zeige Repositoryinformationen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="215"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="200"/> <source>Show some repository related information for the local project</source> <translation>Zeige Repository bezogene Informationen des lokalen Projektes an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="203"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation><b>Zeige Repositoryinformationen</b><p>Dies zeigt repositorybezogene Informationen des lokalen Projektes an.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source>Tag in repository</source> + <translation>Im Repository markieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source>&Tag in repository...</source> + <translation>Im Repository &markieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="216"/> + <source>Tag the local project in the repository</source> + <translation>Das lokale Projekt im Repository markieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Im Repository markieren</b><p>Dies markiert das lokale Projekt im Repository.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> - <source>Tag in repository</source> - <translation>Im Repository markieren</translation> + <source>Export from repository</source> + <translation>Export aus Repository</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> - <source>&Tag in repository...</source> - <translation>Im Repository &markieren...</translation> + <source>&Export from repository...</source> + <translation>&Export aus Repository...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="231"/> - <source>Tag the local project in the repository</source> - <translation>Das lokale Projekt im Repository markieren</translation> + <source>Export a project from the repository</source> + <translation>Exportiert ein Projekt aus dem Repository</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Im Repository markieren</b><p>Dies markiert das lokale Projekt im Repository.</p></translation> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>Export aus Repository</b<<p>Dies exportiert ein Projekt aus dem Repository.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> - <source>Export from repository</source> - <translation>Export aus Repository</translation> + <source>Command options</source> + <translation>Befehlsoptionen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> - <source>&Export from repository...</source> - <translation>&Export aus Repository...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="246"/> - <source>Export a project from the repository</source> - <translation>Exportiert ein Projekt aus dem Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation><b>Export aus Repository</b<<p>Dies exportiert ein Projekt aus dem Repository.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/> - <source>Command options</source> - <translation>Befehlsoptionen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/> <source>Command &options...</source> <translation>Befehls&optionen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Show the VCS command options</source> <translation>Zeigt die VCS-Befehlsoptionen</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation><b>Befehlsoptionen...</b><p>Dies öffnet einen Dialog zur Eingabe der VCS-Befehlsoptionen.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/> + <source>Revert changes</source> + <translation>Änderungen rückgängig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/> + <source>Re&vert changes</source> + <translation>Änderungen &rückgängig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <source>Revert all changes made to the local project</source> + <translation>Alle Änderungen am lokalen Projekt werden rückgängig gemacht</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation><b>Befehlsoptionen...</b><p>Dies öffnet einen Dialog zur Eingabe der VCS-Befehlsoptionen.</p></translation> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation><b>Änderungen rückgängig</b><p>Dies macht alle Änderungen am lokalen Projekt werden rückgängig.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/> - <source>Revert changes</source> - <translation>Änderungen rückgängig</translation> + <source>Merge</source> + <translation>Änderungen zusammenführen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/> - <source>Re&vert changes</source> - <translation>Änderungen &rückgängig</translation> + <source>Mer&ge changes...</source> + <translation>Änderungen &zusammenführen...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> - <source>Revert all changes made to the local project</source> - <translation>Alle Änderungen am lokalen Projekt werden rückgängig gemacht</translation> + <source>Merge changes of a tag/revision into the local project</source> + <translation>Führe Änderungen eines Tags/Zweiges mit dem lokalen Projekt zusammen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation><b>Änderungen rückgängig</b><p>Dies macht alle Änderungen am lokalen Projekt werden rückgängig.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/> - <source>Merge</source> - <translation>Änderungen zusammenführen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/> - <source>Mer&ge changes...</source> - <translation>Änderungen &zusammenführen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="289"/> - <source>Merge changes of a tag/revision into the local project</source> - <translation>Führe Änderungen eines Tags/Zweiges mit dem lokalen Projekt zusammen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Änderungen zusammenführen</b><p>Dies führt Änderungen eines Tags/Zweiges mit dem lokalen Projekt zusammen.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/> + <source>Switch</source> + <translation>Umschalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/> + <source>S&witch...</source> + <translation>Umschal&ten...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <source>Switch the local copy to another tag/branch</source> + <translation>Schalte die lokale Kopie auf ein anderes Tag/anderen Zweig um</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> + <translation><b>Umschalten</b><p>Dies schaltet die lokale Kopie auf ein anderes Tag/anderen Zweig um.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>Switch</source> - <translation>Umschalten</translation> + <source>Conflicts resolved</source> + <translation>Konflikte gelöst</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>S&witch...</source> - <translation>Umschal&ten...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> - <source>Switch the local copy to another tag/branch</source> - <translation>Schalte die lokale Kopie auf ein anderes Tag/anderen Zweig um</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> - <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> - <translation><b>Umschalten</b><p>Dies schaltet die lokale Kopie auf ein anderes Tag/anderen Zweig um.</p></translation> + <source>Con&flicts resolved</source> + <translation>&Konflikte gelöst</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="304"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation>Markiert alle Konflikte des lokalen Projektes als gelöst</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="307"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation><b>Konflikte gelöst</b><p>Dies markiert alle Konflikte des lokalen Projektes als gelöst.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> - <source>Conflicts resolved</source> - <translation>Konflikte gelöst</translation> + <source>Cleanup</source> + <translation>Aufräumen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> - <source>Con&flicts resolved</source> - <translation>&Konflikte gelöst</translation> + <source>Cleanu&p</source> + <translation>Au&fräumen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation>Markiert alle Konflikte des lokalen Projektes als gelöst</translation> + <source>Cleanup the local project</source> + <translation>Räume das lokale Projekt auf</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="322"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation><b>Konflikte gelöst</b><p>Dies markiert alle Konflikte des lokalen Projektes als gelöst.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/> - <source>Cleanup</source> - <translation>Aufräumen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/> - <source>Cleanu&p</source> - <translation>Au&fräumen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> - <source>Cleanup the local project</source> - <translation>Räume das lokale Projekt auf</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="337"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Aufräumen</b><p>Dies räumt das lokale Projekt auf.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>Execute command</source> <translation>Befehl ausführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>E&xecute command...</source> <translation>Befehl ausf&ühren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="333"/> <source>Execute an arbitrary VCS command</source> <translation>Führe einen beliebigen VCS-Befehl aus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="336"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation><b>Befehl ausführen</b><p>Dies öffnet einen Dialog zur Eingabe eines beliebeigen VCS-Befehls.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/> <source>List tags</source> <translation>Marken listen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/> <source>List tags...</source> <translation>Marken listen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> <source>List tags of the project</source> <translation>Listet Marken des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="350"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Marken listen</b><p>Dies listet die Marken des Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches</source> <translation>Zweige listen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches...</source> <translation>Zweige listen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="361"/> <source>List branches of the project</source> <translation>Listet Zweige des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="364"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Zweige listen</b><p>Dies listet die Zweige des Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source>List repository contents</source> <translation>Repositoryinhalt listen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source>List repository contents...</source> <translation>Repositoryinhalt listen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="375"/> <source>Lists the contents of the repository</source> <translation>Listet den Inhalt des Repositorys</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation><b>Repositoryinhalt listen</b><p>Dies listet den Inhalt des Repositorys.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/> <source>Set Property</source> <translation>Eigenschaft definieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/> <source>Set Property...</source> <translation>Eigenschaft definieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="389"/> <source>Set a property for the project files</source> <translation>Definiert eine Eigenschaft für alle Projektdateien</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="392"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation><b>Eigenschaft definieren</b><p>Dies definiert eine Eigenschaft für alle Projektdateien.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source>List Properties</source> <translation>Eigenschaften listen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source>List Properties...</source> <translation>Eigenschaften listen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="403"/> <source>List properties of the project files</source> <translation>Listet Eigenschaften der Projektdateien</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation><b>Eigenschaften listen</b<p>Dies listet die Eigenschaften der Projektdateien.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/> <source>Delete Property</source> <translation>Eigenschaft löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/> <source>Delete Property...</source> <translation>Eigenschaft löschen...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> + <source>Delete a property for the project files</source> + <translation>Eine Eigenschaft für alle Projektdateien löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="420"/> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation><b>Eigenschaft löschen</b><p>Dies löscht eine Eigenschaft für alle Projektdateien.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/> + <source>Relocate</source> + <translation>Relozieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/> + <source>Relocate...</source> + <translation>Relozieren...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> - <source>Delete a property for the project files</source> - <translation>Eine Eigenschaft für alle Projektdateien löschen</translation> + <source>Relocate the working copy to a new repository URL</source> + <translation>Reloziere die Arbeitskopie zu einer neuen Repository-URL</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation><b>Eigenschaft löschen</b><p>Dies löscht eine Eigenschaft für alle Projektdateien.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/> - <source>Relocate</source> - <translation>Relozieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/> - <source>Relocate...</source> - <translation>Relozieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> - <source>Relocate the working copy to a new repository URL</source> - <translation>Reloziere die Arbeitskopie zu einer neuen Repository-URL</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>Relozieren</b><p>Dies reloziert die Arbeitskopie zu einer neuen Repository-URL.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/> + <source>Repository Browser</source> + <translation>Repositorybrowser</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/> + <source>Repository Browser...</source> + <translation>Repositorybrowser...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> + <source>Show the Repository Browser dialog</source> + <translation>Zeigt den Repositorybrowser-Dialog</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation><b>Repositorybrowser...</b><p>Dies zeigt den Repositorybrowser-Dialog.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> - <source>Repository Browser</source> - <translation>Repositorybrowser</translation> + <source>Configure</source> + <translation>Einstellungen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> - <source>Repository Browser...</source> - <translation>Repositorybrowser...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="463"/> - <source>Show the Repository Browser dialog</source> - <translation>Zeigt den Repositorybrowser-Dialog</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="466"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation><b>Repositorybrowser...</b><p>Dies zeigt den Repositorybrowser-Dialog.</p></translation> + <source>Configure...</source> + <translation>Einstellungen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="462"/> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation>Zeigt den Konfigurationsdialog mit ausgewählter Subversionseite</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="465"/> + <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> + <translation><b>Einstellungen</b><p>Zeigt den Konfigurationsdialog mit ausgewählter Subversionseite.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/> - <source>Configure</source> - <translation>Einstellungen</translation> + <source>Upgrade</source> + <translation>Modernisieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/> - <source>Configure...</source> - <translation>Einstellungen...</translation> + <source>Upgrade...</source> + <translation>Modernisieren...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="477"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation>Zeigt den Konfigurationsdialog mit ausgewählter Subversionseite</translation> + <source>Upgrade the working copy to the current format</source> + <translation>Ändert das Format der Arbeitskopie in das aktuelle Format</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="480"/> - <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> - <translation><b>Einstellungen</b><p>Zeigt den Konfigurationsdialog mit ausgewählter Subversionseite.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/> - <source>Upgrade</source> - <translation>Modernisieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/> - <source>Upgrade...</source> - <translation>Modernisieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="492"/> - <source>Upgrade the working copy to the current format</source> - <translation>Ändert das Format der Arbeitskopie in das aktuelle Format</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="495"/> <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation><b>Modernisieren</b><p>Ändert das Format der Arbeitskopie in das aktuelle Format.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="559"/> <source>Subversion (pysvn)</source> <translation>Subversion (pysvn)</translation> </message> @@ -47550,12 +47730,12 @@ <translation>Hinzufügen...</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="58"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="68"/> <source>Remove</source> <translation>Entfernen</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="117"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="132"/> <source>Add Documentation</source> <translation>Dokumentation hinzufügen</translation> </message> @@ -47565,17 +47745,17 @@ <translation>Qt-Hilfedateien (*.qch)</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="107"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="122"/> <source>The file <b>{0}</b> is not a valid Qt Help File.</source> <translation>Die Datei <b>{0}</b> ist keine gültige Qt Hilfedatei.</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="117"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="132"/> <source>The namespace <b>{0}</b> is already registered.</source> <translation>Der namensraum <b>{0}</b> ist bereits registriert.</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="152"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="167"/> <source>Remove Documentation</source> <translation>Dokumentation entfernen</translation> </message> @@ -47585,30 +47765,40 @@ <translation>QtHelp-Dokumente mittels Dateiauswahldialog auswählen</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="55"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="65"/> <source>Press to remove the selected documents from the database</source> <translation>Die ausgewählten Dokumente entfernen</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="137"/> - <source>Do you really want to remove the selected documentation sets from the database?</source> - <translation>Sollen die ausgewählten Dokumentationen wirklich entfernt werden?</translation> - </message> - <message> <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="152"/> + <source>Do you really want to remove the selected documentation sets from the database?</source> + <translation>Sollen die ausgewählten Dokumentationen wirklich entfernt werden?</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="167"/> <source>Some documents currently opened reference the documentation you are attempting to remove. Removing the documentation will close those documents. Remove anyway?</source> <translation>Einige der geöffneten Dokumente beziehen sich auf die zu entfernende Dokumentation. Das Entfernen der Dokumentation wird diese schließen. Trotzdem löschen?</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="78"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="55"/> <source>Press to select QtHelp documents provided by a plug-in to add to the database</source> <translation>Drücken, um QtHelp Dokumente, die durch ein Plug-in bereitgestellt werden, zur Datenbank hinzuzufügen</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="81"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="58"/> <source>Add from Plug-ins...</source> <translation>Von Plug-ins hinzufügen...</translation> </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="85"/> + <source>Select to manage the plug-in provided documentation sets</source> + <translation>Auswählen, um die von Plug-ins bereitgestellten Dokumentationssätze zu verwalten</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="88"/> + <source>Manage Plug-ins...</source> + <translation>Plug-ins verwalten...</translation> + </message> </context> <context> <name>QtHelpDocumentationSelectionDialog</name> @@ -47622,6 +47812,61 @@ <source>Select the documentation files to be installed:</source> <translation>Wähle die zu installierenden Dokumentationsdateien:</translation> </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="144"/> + <source>Delete Documentation Sets</source> + <translation>Dokumentationssätze löschen</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="91"/> + <source>Shall the selected documentation sets really be deleted?</source> + <translation>Sollen die ausgewählten Dokumentationssätze wirklich gelöscht werden?</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="107"/> + <source><p>The documentation set <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> + <translation><p>Der Dokumentationssatz <b>{0}</b> konnte nicht gelöscht werden.</p><p>Ursache: {1}</p></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="126"/> + <source>Shall the selected documentation set categories really be deleted?</source> + <translation>Sollen die gewählten Dumentenkategorien wirklich gelöscht werden?</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="144"/> + <source>Shall all documentation sets really be deleted?</source> + <translation>Sollen wirklich alle Dokumentationssätze gelöscht werden?</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="56"/> + <source>Press to delete the selected documentation sets</source> + <translation>Drücken, um die ausgewählten Dokumentationssätze zu löschen</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="59"/> + <source>Delete</source> + <translation>Löschen</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="66"/> + <source>Press to delete the selected category</source> + <translation>Drücken, um die ausgewählten Kategorien zu löschen</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="69"/> + <source>Delete Categories</source> + <translation>Kategorien löschen</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="76"/> + <source>Press to delete all entries</source> + <translation>Drücken, um alle Einträge zu löschen</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="79"/> + <source>Delete All</source> + <translation>Alle Löschen</translation> + </message> </context> <context> <name>QtHelpFiltersDialog</name> @@ -48894,6 +49139,19 @@ </message> </context> <context> + <name>RestructuredTextProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/RestructuredTextProvider.py" line="411"/> + <source>Create List</source> + <translation>Liste erzeugen</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/RestructuredTextProvider.py" line="411"/> + <source>Enter desired number of list elements:</source> + <translation>Gib die vorgesehene Anzahl Listenelemente ein:</translation> + </message> +</context> +<context> <name>SafariImporter</name> <message> <location filename="../WebBrowser/Bookmarks/BookmarksImporters/SafariImporter.py" line="44"/> @@ -51993,57 +52251,57 @@ <translation>Expotiere das Projekt aus dem Subversion-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/> <source>Subversion Error</source> <translation>Subversion-Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="951"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>Die URL des Projektrepositorys konnte nicht aus der Arbeitskopie ermittelt werden. Die Tag-Operation wird abgebrochen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="998"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="978"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>Die URL des Projektrepositorys hat ein ungültiges Format. Die Tag-Operation wird abgebrochen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1033"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1013"/> <source>Tagging {0} in the Subversion repository</source> <translation>Markiere {0} im Subversion-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1093"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1073"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>Die URL des Projektrepositorys konnte nicht aus der Arbeitskopie ermittelt werden. Die Umschaltoperation wird abgebrochen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>Die URL des Projektrepositorys hat ein ungültiges Format. Die Umschaltoperation wird abgebrochen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1151"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1131"/> <source>Switching to {0}</source> <translation>Schalte {0} um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1196"/> <source>Merging {0}</source> <translation>Arbeite Änderungen in {0} ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1482"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1462"/> <source>Cleaning up {0}</source> <translation>Räume {0} auf</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1512"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1492"/> <source>Subversion command</source> <translation>Subversion-Befehl</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1695"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> @@ -52063,22 +52321,22 @@ <translation>Subversion-Export</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1779"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1759"/> <source>Subversion Set Property</source> <translation>Subversion-Eigenschaft definieren</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1781"/> + <source>You have to supply a property name. Aborting.</source> + <translation>Sie müssen einen Namen für die Eigenschaft angeben. Abbruch.</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1801"/> - <source>You have to supply a property name. Aborting.</source> - <translation>Sie müssen einen Namen für die Eigenschaft angeben. Abbruch.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1821"/> <source>Subversion Delete Property</source> <translation>Subversion-Eigenschaft löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1791"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1771"/> <source>Enter property name</source> <translation>Gib den Namen der Eigenschaft ein</translation> </message> @@ -52108,12 +52366,12 @@ <translation>Lösche Dateien/Verzeichnisse aus dem Subversion-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1056"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1684"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1664"/> <source>Resolving conficts</source> <translation>Löse Konflikte</translation> </message> @@ -52138,22 +52396,12 @@ <translation>Das Projekt konnte nicht aus dem Repository geladen werden.<br />Stelle das Original wieder her.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> - <source>Subversion Log</source> - <translation>Subversion-Log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> - <source>Select number of entries to show.</source> - <translation>Wähle Anzahl der anzuzeigenden Einträge.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2080"/> <source>Locking in the Subversion repository</source> <translation>Sperren im Subversion-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2108"/> <source>Unlocking in the Subversion repository</source> <translation>Entsperren im Subversion-Repository</translation> </message> @@ -52163,34 +52411,34 @@ <translation>Revision {0} eingepflegt.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1255"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1234"/> <source>Revision {0}. </source> <translation>Revision {0}. </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1923"/> <source>Property set.</source> <translation>Eigenschaft definiert.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1997"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1976"/> <source>Property deleted.</source> <translation>Eigenschaft gelöscht.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/> <source>Subversion Lock</source> <translation>Subversion-Sperre</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/> <source>Enter lock comment</source> <translation>Gib eine Kommentar für die Sperre ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2153"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2133"/> <source>Relocating</source> <translation>Relozierung</translation> </message> @@ -52357,7 +52605,7 @@ <translation>Der svn-Prozess endete mit dem Code {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1984"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1964"/> <source>The svn process did not finish within 30s.</source> <translation>Der svn-Prozess endete nicht innerhalb von 30s.</translation> </message> @@ -52367,27 +52615,27 @@ <translation>Das svn-Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/> <source>Repository Browser</source> <translation>Repositorybrowser</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/> <source>Enter the repository URL.</source> <translation>Gib die URL des Repository ein.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2221"/> <source>Remove from changelist</source> <translation>Von Änderungsliste entfernen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/> <source>Add to changelist</source> <translation>Zu Änderungsliste hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/> <source>Enter name of the changelist:</source> <translation>Gib den Namen der Änderungsliste ein:</translation> </message> @@ -52417,37 +52665,37 @@ <translation>Das Einpflegen von Änderungen betrifft Dateien mit ungesicherten Änderungen. Soll die Aktion fortgesetzt werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1042"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation>Wollen Sie wirklich alle Änderungen an den folgenden Dateien oder Verzeichnissen rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/> <source>Do you really want to revert all changes of the project?</source> <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1987"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1967"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/> <source>Subversion Side-by-Side Difference</source> <translation>Subversion Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2305"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2285"/> <source>Upgrade</source> <translation>Modernisieren</translation> </message> @@ -53292,12 +53540,12 @@ <translation>Subversion-Log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="661"/> <source>Revision</source> <translation>Revision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="658"/> <source>Author</source> <translation>Autor</translation> </message> @@ -53307,7 +53555,7 @@ <translation>Datum</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="165"/> <source>Message</source> <translation>Nachricht</translation> </message> @@ -53347,102 +53595,102 @@ <translation>Gib die Anzahl an zu holenden Einträgen ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="261"/> <source>Press to generate a diff to the previous revision</source> <translation>Drücken, um ein Diff zur vorherigen Revision zu erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="264"/> <source>&Diff to Previous</source> <translation>&Diff zu vorherigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="271"/> <source>Press to compare two revisions</source> <translation>Drücken, um zwei Revisionen zu vergleichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> <source>&Compare Revisions</source> <translation>&Vergleiche Revisionen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="89"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="93"/> <source>Added</source> <translation>Hinzugefügt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="90"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="94"/> <source>Deleted</source> <translation>Gelöscht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="91"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="95"/> <source>Modified</source> <translation>Modifiziert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="504"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="527"/> <source>Subversion Error</source> <translation>Subversion-Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="312"/> <source>Errors</source> <translation>Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="318"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> <translation><b>Subversion-Log-Fehler</b><p>Dies zeigt mögliche Fehlermeldungen des svn log-Befehls.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="334"/> <source>Input</source> <translation>Eingabe</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="336"/> - <source>Press to send the input to the subversion process</source> - <translation>Drücken um die Eingabe an den Subversion-Prozess zu senden</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/> - <source>&Send</source> - <translation>Sen&den</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="349"/> - <source>Enter data to be sent to the subversion process</source> - <translation>Gib die Daten ein, die an den Subversion-Prozess geschickt werden sollen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> - <source>Select to switch the input field to password mode</source> - <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> + <source>Press to send the input to the subversion process</source> + <translation>Drücken um die Eingabe an den Subversion-Prozess zu senden</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> - <source>&Password Mode</source> - <translation>&Kennwortmodus</translation> + <source>&Send</source> + <translation>Sen&den</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="369"/> + <source>Enter data to be sent to the subversion process</source> + <translation>Gib die Daten ein, die an den Subversion-Prozess geschickt werden sollen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="376"/> + <source>Select to switch the input field to password mode</source> + <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="379"/> + <source>&Password Mode</source> + <translation>&Kennwortmodus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="382"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="313"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="313"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> @@ -53487,156 +53735,29 @@ <translation>Bei Kopieren/Umbenennen anhalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="96"/> <source>Replaced</source> <translation>Ersetzt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="294"/> <source>Select to show differences side-by-side</source> <translation>Auswählen, um Unterschiede nebeinander anzuzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="297"/> <source>Show differences side-by-side</source> <translation>Unterschiede nebeneinander anzeigen</translation> </message> -</context> -<context> - <name>SvnLogDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="81"/> - <source>Added</source> - <translation>Hinzugefügt</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="82"/> - <source>Deleted</source> - <translation>Gelöscht</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="83"/> - <source>Modified</source> - <translation>Modifiziert</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="87"/> - <source>revision</source> - <translation>Revision</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="193"/> - <source>diff to {0}</source> - <translation>Unterschied zu {0}</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="14"/> - <source>Subversion Log</source> - <translation>Subversion-Log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="26"/> - <source>Log</source> - <translation>Log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="32"/> - <source><b>Subversion Log</b><p>This shows the output of the svn log command. By clicking on the links you may show the difference between versions.</p></source> - <translation><b>Subversion-Log</b><p>Dies zeigt die Ausgabe des svn log-Befehls. Durch Anklicken der Verweise kann der Unterschied zwischen den Versionen angezeigt werden.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="58"/> - <source>Errors</source> - <translation>Fehler</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="64"/> - <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> - <translation><b>Subversion-Log-Fehler</b><p>Dies zeigt mögliche Fehlermeldungen des svn log-Befehls.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="80"/> - <source>Input</source> - <translation>Eingabe</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="102"/> - <source>Press to send the input to the subversion process</source> - <translation>Drücken um die Eingabe an den Subversion-Prozess zu senden</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="105"/> - <source>&Send</source> - <translation>Sen&den</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="108"/> - <source>Alt+S</source> - <translation>Alt+D</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="115"/> - <source>Enter data to be sent to the subversion process</source> - <translation>Gib die Daten ein, die an den Subversion-Prozess geschickt werden sollen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="122"/> - <source>Select to switch the input field to password mode</source> - <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="125"/> - <source>&Password Mode</source> - <translation>&Kennwortmodus</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="128"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> - <source>Process Generation Error</source> - <translation>Fehler beim Prozessstart</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="202"/> - <source><i>author: {0}</i><br /> -</source> - <translation><i>Autor: {0}</i><br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="205"/> - <source><i>date: {0}</i><br /> -</source> - <translation><i>Datum: {0}</i><br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="191"/> - <source> (copied from {0}, revision {1})</source> - <translation> (kopiert von {0}, Revision {1})</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="55"/> - <source><b>Processing your request, please wait...</b></source> - <translation><b>Verarbeite Ihre Anfrage, bitte warten...</b></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="42"/> - <source>Select to show differences side-by-side</source> - <translation>Auswählen, um Unterschiede nebeinander anzuzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="45"/> - <source>Show differences side-by-side</source> - <translation>Unterschiede nebeneinander anzeigen</translation> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <source>Press to move up in the log list</source> + <translation>Drücken, um in der Historie nach oben zu gehen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <source>Press to move down in the log list</source> + <translation>Drücken, um in der Historie nach unten zu gehen</translation> </message> </context> <context> @@ -53931,177 +54052,172 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="654"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="646"/> <source>Update from repository</source> <translation>Abgleich mit Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="658"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="650"/> <source>Commit changes to repository...</source> <translation>Änderungen einpflegen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="656"/> <source>Add to repository</source> <translation>Zum Repository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="385"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="381"/> <source>Add tree to repository</source> <translation>Verzeichnisbaum zum Repository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="660"/> <source>Remove from repository (and disk)</source> <translation>Vom Repository (und der Platte) löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="566"/> - <source>Show log</source> - <translation>Beschreibungen anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="684"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="676"/> <source>Show status</source> <translation>Status anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="696"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="700"/> + <source>Merge changes</source> + <translation>Änderungen zusammenführen</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="708"/> - <source>Merge changes</source> - <translation>Änderungen zusammenführen</translation> + <source>Set Property</source> + <translation>Eigenschaft definieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="710"/> + <source>List Properties</source> + <translation>Eigenschaften listen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="713"/> + <source>Delete Property</source> + <translation>Eigenschaft löschen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="716"/> - <source>Set Property</source> - <translation>Eigenschaft definieren</translation> + <source>Select all local file entries</source> + <translation>Alle lokalen Dateieinträge auswählen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="718"/> - <source>List Properties</source> - <translation>Eigenschaften listen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="721"/> - <source>Delete Property</source> - <translation>Eigenschaft löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="724"/> - <source>Select all local file entries</source> - <translation>Alle lokalen Dateieinträge auswählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="726"/> <source>Select all versioned file entries</source> <translation>Alle versionierten Dateieinträge auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="720"/> <source>Select all local directory entries</source> <translation>Alle lokalen Verzeichniseinträge auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="730"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="722"/> <source>Select all versioned directory entries</source> <translation>Alle versionierten Verzeichniseinträge auswählen</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="430"/> + <source>Lock</source> + <translation>Sperren</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="434"/> - <source>Lock</source> - <translation>Sperren</translation> + <source>Unlock</source> + <translation>Entsperren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="438"/> - <source>Unlock</source> - <translation>Entsperren</translation> + <source>Break Lock</source> + <translation>Sperre brechen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="442"/> - <source>Break Lock</source> - <translation>Sperre brechen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="446"/> <source>Steal Lock</source> <translation>Sperre stehlen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="634"/> <source>Version Control</source> <translation>Versionskontrolle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="286"/> <source>Show annotated file</source> <translation>Zeige kommentierte Datei</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="572"/> <source>Show repository info</source> <translation>Zeige Repositoryinformationen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="562"/> <source>Show log browser</source> <translation>Zeige Log Browser</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="733"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="725"/> <source>Configure...</source> <translation>Einstellungen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="667"/> <source>Add to Changelist</source> <translation>Zu Änderungsliste hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="679"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="671"/> <source>Remove from Changelist</source> <translation>Von Änderungsliste entfernen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="547"/> <source>Copy</source> <translation>Kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="549"/> <source>Move</source> <translation>Verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="681"/> <source>Show differences</source> <translation>Unterschiede anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="271"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="267"/> <source>Show differences side-by-side</source> <translation>Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="693"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="685"/> <source>Show differences (extended)</source> <translation>Unterschiede anzeigen (erweitert)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="276"/> <source>Show differences side-by-side (extended)</source> <translation>Unterschiede nebeneinander anzeigen (erweitert)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="698"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="690"/> <source>Show differences (URLs)</source> <translation>Unterschiede anzeigen (URLs)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="712"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/> <source>Conflicts resolved</source> <translation>Konflikte gelöst</translation> </message> @@ -54170,506 +54286,486 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/> - <source>Show log</source> - <translation>Beschreibungen anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/> - <source>Show &log</source> - <translation>&Beschreibungen anzeigen</translation> + <source>Show log browser</source> + <translation>Zeige Log-Browser</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="104"/> - <source>Show the log of the local project</source> - <translation>Zeigt die Änderungsbeschreibungen des lokalen Projektes an</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="107"/> - <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation><b>Beschreibungen anzeigen</b><p>Dies zeigt die Änderungsbeschreibungen (Log) des lokalen Projektes an.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="131"/> + <source>Show a dialog to browse the log of the local project</source> + <translation>Zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/> <source>Show &difference</source> <translation>&Unterschiede anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="121"/> <source>Show the difference of the local project to the repository</source> <translation>Zeigt den Unterschied des lokalen Projektes zum Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="137"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Zeigt den Unterschied von Revisionen des Projektes an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="164"/> <source>Show status</source> <translation>Status anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="164"/> <source>Show &status</source> <translation>Status an&zeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="169"/> <source>Show the status of the local project</source> <translation>Zeige den Status des lokalen Projektes an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="172"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Status anzeigen</b><p>Dies zeigt den Status des lokalen Projektes an.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="195"/> + <source>Tag in repository</source> + <translation>Im Repository markieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="195"/> + <source>&Tag in repository...</source> + <translation>Im Repository &markieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="200"/> + <source>Tag the local project in the repository</source> + <translation>Das lokale Projekt im Repository markieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="203"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Im Repository markieren</b><p>Dies markiert das lokale Projekt im Repository.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="210"/> - <source>Tag in repository</source> - <translation>Im Repository markieren</translation> + <source>Export from repository</source> + <translation>Export aus Repository</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="210"/> - <source>&Tag in repository...</source> - <translation>Im Repository &markieren...</translation> + <source>&Export from repository...</source> + <translation>&Export aus Repository...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="215"/> - <source>Tag the local project in the repository</source> - <translation>Das lokale Projekt im Repository markieren</translation> + <source>Export a project from the repository</source> + <translation>Exportiert ein Projekt aus dem Repository</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="218"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Im Repository markieren</b><p>Dies markiert das lokale Projekt im Repository.</p></translation> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>Export aus Repository</b<<p>Dies exportiert ein Projekt aus dem Repository.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/> + <source>Command options</source> + <translation>Befehlsoptionen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/> - <source>Export from repository</source> - <translation>Export aus Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/> - <source>&Export from repository...</source> - <translation>&Export aus Repository...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="230"/> - <source>Export a project from the repository</source> - <translation>Exportiert ein Projekt aus dem Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="233"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation><b>Export aus Repository</b<<p>Dies exportiert ein Projekt aus dem Repository.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="240"/> - <source>Command options</source> - <translation>Befehlsoptionen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="240"/> <source>Command &options...</source> <translation>Befehls&optionen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="229"/> <source>Show the VCS command options</source> <translation>Zeigt die VCS-Befehlsoptionen</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="231"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation><b>Befehlsoptionen...</b><p>Dies öffnet einen Dialog zur Eingabe der VCS-Befehlsoptionen.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="238"/> + <source>Revert changes</source> + <translation>Änderungen rückgängig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="238"/> + <source>Re&vert changes</source> + <translation>Änderungen &rückgängig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="243"/> + <source>Revert all changes made to the local project</source> + <translation>Alle Änderungen am lokalen Projekt werden rückgängig gemacht</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="246"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation><b>Befehlsoptionen...</b><p>Dies öffnet einen Dialog zur Eingabe der VCS-Befehlsoptionen.</p></translation> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation><b>Änderungen rückgängig</b><p>Dies macht alle Änderungen am lokalen Projekt werden rückgängig.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/> + <source>Merge</source> + <translation>Änderungen zusammenführen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/> - <source>Revert changes</source> - <translation>Änderungen rückgängig</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/> - <source>Re&vert changes</source> - <translation>Änderungen &rückgängig</translation> + <source>Mer&ge changes...</source> + <translation>Änderungen &zusammenführen...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="258"/> - <source>Revert all changes made to the local project</source> - <translation>Alle Änderungen am lokalen Projekt werden rückgängig gemacht</translation> + <source>Merge changes of a tag/revision into the local project</source> + <translation>Führe Änderungen eines Tags/Zweiges mit dem lokalen Projekt zusammen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="261"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation><b>Änderungen rückgängig</b><p>Dies macht alle Änderungen am lokalen Projekt werden rückgängig.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="268"/> - <source>Merge</source> - <translation>Änderungen zusammenführen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="268"/> - <source>Mer&ge changes...</source> - <translation>Änderungen &zusammenführen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="273"/> - <source>Merge changes of a tag/revision into the local project</source> - <translation>Führe Änderungen eines Tags/Zweiges mit dem lokalen Projekt zusammen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="276"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Änderungen zusammenführen</b><p>Dies führt Änderungen eines Tags/Zweiges mit dem lokalen Projekt zusammen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="269"/> <source>Switch</source> <translation>Umschalten</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="269"/> + <source>S&witch...</source> + <translation>Umschal&ten...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="274"/> + <source>Switch the local copy to another tag/branch</source> + <translation>Schalte die lokale Kopie auf ein anderes Tag/anderen Zweig um</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="277"/> + <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> + <translation><b>Umschalten</b><p>Dies schaltet die lokale Kopie auf ein anderes Tag/anderen Zweig um.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> + <source>Cleanup</source> + <translation>Aufräumen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> + <source>Cleanu&p</source> + <translation>Au&fräumen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="303"/> + <source>Cleanup the local project</source> + <translation>Räume das lokale Projekt auf</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="306"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Aufräumen</b><p>Dies räumt das lokale Projekt auf.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="313"/> + <source>Execute command</source> + <translation>Befehl ausführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="313"/> + <source>E&xecute command...</source> + <translation>Befehl ausf&ühren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="317"/> + <source>Execute an arbitrary VCS command</source> + <translation>Führe einen beliebigen VCS-Befehl aus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="320"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> + <translation><b>Befehl ausführen</b><p>Dies öffnet einen Dialog zur Eingabe eines beliebeigen VCS-Befehls.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="327"/> + <source>List tags</source> + <translation>Marken listen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="327"/> + <source>List tags...</source> + <translation>Marken listen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="331"/> + <source>List tags of the project</source> + <translation>Listet Marken des Projektes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="334"/> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Marken listen</b><p>Dies listet die Marken des Projektes.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="341"/> + <source>List branches</source> + <translation>Zweige listen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="341"/> + <source>List branches...</source> + <translation>Zweige listen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="345"/> + <source>List branches of the project</source> + <translation>Listet Zweige des Projektes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="348"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Zweige listen</b><p>Dies listet die Zweige des Projektes.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="355"/> + <source>List repository contents</source> + <translation>Repositoryinhalt listen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="355"/> + <source>List repository contents...</source> + <translation>Repositoryinhalt listen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="359"/> + <source>Lists the contents of the repository</source> + <translation>Listet den Inhalt des Repositorys</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="362"/> + <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> + <translation><b>Repositoryinhalt listen</b><p>Dies listet den Inhalt des Repositorys.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="369"/> + <source>Set Property</source> + <translation>Eigenschaft definieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="369"/> + <source>Set Property...</source> + <translation>Eigenschaft definieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="373"/> + <source>Set a property for the project files</source> + <translation>Definiert eine Eigenschaft für alle Projektdateien</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="376"/> + <source><b>Set Property</b><p>This sets a property for the project files.</p></source> + <translation><b>Eigenschaft definieren</b><p>Dies definiert eine Eigenschaft für alle Projektdateien.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="383"/> + <source>List Properties</source> + <translation>Eigenschaften listen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="383"/> + <source>List Properties...</source> + <translation>Eigenschaften listen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="387"/> + <source>List properties of the project files</source> + <translation>Listet Eigenschaften der Projektdateien</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="390"/> + <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> + <translation><b>Eigenschaften listen</b<p>Dies listet die Eigenschaften der Projektdateien.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="397"/> + <source>Delete Property</source> + <translation>Eigenschaft löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="397"/> + <source>Delete Property...</source> + <translation>Eigenschaft löschen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="401"/> + <source>Delete a property for the project files</source> + <translation>Eine Eigenschaft für alle Projektdateien löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="404"/> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation><b>Eigenschaft löschen</b><p>Dies löscht eine Eigenschaft für alle Projektdateien.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/> + <source>Relocate</source> + <translation>Relozieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/> + <source>Relocate...</source> + <translation>Relozieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="416"/> + <source>Relocate the working copy to a new repository URL</source> + <translation>Reloziere die Arbeitskopie zu einer neuen Repository-URL</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="419"/> + <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> + <translation><b>Relozieren</b><p>Dies reloziert die Arbeitskopie zu einer neuen Repository-URL.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="153"/> + <source>Show the difference of the project between two repository URLs</source> + <translation>Zeigt den Unterschied des Projektes zwischen zwei Repository-URLs</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="427"/> + <source>Repository Browser</source> + <translation>Repositorybrowser</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="427"/> + <source>Repository Browser...</source> + <translation>Repositorybrowser...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="432"/> + <source>Show the Repository Browser dialog</source> + <translation>Zeigt den Repositorybrowser-Dialog</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="435"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation><b>Repositorybrowser...</b><p>Dies zeigt den Repositorybrowser-Dialog.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="107"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation><b>Zeige Log-Browser</b><p>Dies zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen. Zunächst wird nur eine begrenzte Anzahl an Einträgen angezeigt. Weitere können später geholt werden.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> + <source>Configure</source> + <translation>Einstellungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> + <source>Configure...</source> + <translation>Einstellungen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="446"/> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation>Zeigt den Konfigurationsdialog mit ausgewählter Subversionseite</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="449"/> + <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> + <translation><b>Einstellungen</b><p>Zeigt den Konfigurationsdialog mit ausgewählter Subversionseite.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> - <source>S&witch...</source> - <translation>Umschal&ten...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="289"/> - <source>Switch the local copy to another tag/branch</source> - <translation>Schalte die lokale Kopie auf ein anderes Tag/anderen Zweig um</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="292"/> - <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> - <translation><b>Umschalten</b><p>Dies schaltet die lokale Kopie auf ein anderes Tag/anderen Zweig um.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="314"/> - <source>Cleanup</source> - <translation>Aufräumen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="314"/> - <source>Cleanu&p</source> - <translation>Au&fräumen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="318"/> - <source>Cleanup the local project</source> - <translation>Räume das lokale Projekt auf</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="321"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Aufräumen</b><p>Dies räumt das lokale Projekt auf.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="328"/> - <source>Execute command</source> - <translation>Befehl ausführen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="328"/> - <source>E&xecute command...</source> - <translation>Befehl ausf&ühren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="332"/> - <source>Execute an arbitrary VCS command</source> - <translation>Führe einen beliebigen VCS-Befehl aus</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="335"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> - <translation><b>Befehl ausführen</b><p>Dies öffnet einen Dialog zur Eingabe eines beliebeigen VCS-Befehls.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="342"/> - <source>List tags</source> - <translation>Marken listen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="342"/> - <source>List tags...</source> - <translation>Marken listen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="346"/> - <source>List tags of the project</source> - <translation>Listet Marken des Projektes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="349"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Marken listen</b><p>Dies listet die Marken des Projektes.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="356"/> - <source>List branches</source> - <translation>Zweige listen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="356"/> - <source>List branches...</source> - <translation>Zweige listen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="360"/> - <source>List branches of the project</source> - <translation>Listet Zweige des Projektes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="363"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Zweige listen</b><p>Dies listet die Zweige des Projektes.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="370"/> - <source>List repository contents</source> - <translation>Repositoryinhalt listen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="370"/> - <source>List repository contents...</source> - <translation>Repositoryinhalt listen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="374"/> - <source>Lists the contents of the repository</source> - <translation>Listet den Inhalt des Repositorys</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="377"/> - <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> - <translation><b>Repositoryinhalt listen</b><p>Dies listet den Inhalt des Repositorys.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="384"/> - <source>Set Property</source> - <translation>Eigenschaft definieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="384"/> - <source>Set Property...</source> - <translation>Eigenschaft definieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="388"/> - <source>Set a property for the project files</source> - <translation>Definiert eine Eigenschaft für alle Projektdateien</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="391"/> - <source><b>Set Property</b><p>This sets a property for the project files.</p></source> - <translation><b>Eigenschaft definieren</b><p>Dies definiert eine Eigenschaft für alle Projektdateien.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="398"/> - <source>List Properties</source> - <translation>Eigenschaften listen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="398"/> - <source>List Properties...</source> - <translation>Eigenschaften listen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="402"/> - <source>List properties of the project files</source> - <translation>Listet Eigenschaften der Projektdateien</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="405"/> - <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> - <translation><b>Eigenschaften listen</b<p>Dies listet die Eigenschaften der Projektdateien.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="412"/> - <source>Delete Property</source> - <translation>Eigenschaft löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="412"/> - <source>Delete Property...</source> - <translation>Eigenschaft löschen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="416"/> - <source>Delete a property for the project files</source> - <translation>Eine Eigenschaft für alle Projektdateien löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="419"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation><b>Eigenschaft löschen</b><p>Dies löscht eine Eigenschaft für alle Projektdateien.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="426"/> - <source>Relocate</source> - <translation>Relozieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="426"/> - <source>Relocate...</source> - <translation>Relozieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="431"/> - <source>Relocate the working copy to a new repository URL</source> - <translation>Reloziere die Arbeitskopie zu einer neuen Repository-URL</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="434"/> - <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> - <translation><b>Relozieren</b><p>Dies reloziert die Arbeitskopie zu einer neuen Repository-URL.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="168"/> - <source>Show the difference of the project between two repository URLs</source> - <translation>Zeigt den Unterschied des Projektes zwischen zwei Repository-URLs</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> - <source>Repository Browser</source> - <translation>Repositorybrowser</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> - <source>Repository Browser...</source> - <translation>Repositorybrowser...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="447"/> - <source>Show the Repository Browser dialog</source> - <translation>Zeigt den Repositorybrowser-Dialog</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="450"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation><b>Repositorybrowser...</b><p>Dies zeigt den Repositorybrowser-Dialog.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="114"/> - <source>Show log browser</source> - <translation>Zeige Log-Browser</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="119"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>Zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="122"/> - <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> - <translation><b>Zeige Log-Browser</b><p>Dies zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen. Zunächst wird nur eine begrenzte Anzahl an Einträgen angezeigt. Weitere können später geholt werden.</p></translation> + <source>Conflicts resolved</source> + <translation>Konflikte gelöst</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> + <source>Con&flicts resolved</source> + <translation>&Konflikte gelöst</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="288"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation>Markiert alle Konflikte des lokalen Projektes als gelöst</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="291"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation><b>Konflikte gelöst</b><p>Dies markiert alle Konflikte des lokalen Projektes als gelöst.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <source>Show change lists</source> + <translation>Änderungslisten anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="184"/> + <source>Show the change lists and associated files of the local project</source> + <translation>Zeige die Änderungslisten des lokalen Projektes und die zugehörigen Dateien an</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="187"/> + <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> + <translation><b>Änderungslisten anzeigen</b><p>Dies zeigt die Änderungslisten des lokalen Projektes und die zugehörigen Dateien an</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> + <source>Upgrade</source> + <translation>Modernisieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> - <source>Configure</source> - <translation>Einstellungen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> - <source>Configure...</source> - <translation>Einstellungen...</translation> + <source>Upgrade...</source> + <translation>Modernisieren...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="461"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation>Zeigt den Konfigurationsdialog mit ausgewählter Subversionseite</translation> + <source>Upgrade the working copy to the current format</source> + <translation>Ändert das Format der Arbeitskopie in das aktuelle Format</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="464"/> - <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> - <translation><b>Einstellungen</b><p>Zeigt den Konfigurationsdialog mit ausgewählter Subversionseite.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> - <source>Conflicts resolved</source> - <translation>Konflikte gelöst</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> - <source>Con&flicts resolved</source> - <translation>&Konflikte gelöst</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="303"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation>Markiert alle Konflikte des lokalen Projektes als gelöst</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="306"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation><b>Konflikte gelöst</b><p>Dies markiert alle Konflikte des lokalen Projektes als gelöst.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="194"/> - <source>Show change lists</source> - <translation>Änderungslisten anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="199"/> - <source>Show the change lists and associated files of the local project</source> - <translation>Zeige die Änderungslisten des lokalen Projektes und die zugehörigen Dateien an</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="202"/> - <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> - <translation><b>Änderungslisten anzeigen</b><p>Dies zeigt die Änderungslisten des lokalen Projektes und die zugehörigen Dateien an</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="472"/> - <source>Upgrade</source> - <translation>Modernisieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="472"/> - <source>Upgrade...</source> - <translation>Modernisieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="476"/> - <source>Upgrade the working copy to the current format</source> - <translation>Ändert das Format der Arbeitskopie in das aktuelle Format</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="479"/> <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation><b>Modernisieren</b><p>Ändert das Format der Arbeitskopie in das aktuelle Format.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/> <source>Show differences</source> <translation>Unterschiede anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="132"/> <source>Show differences (extended)</source> <translation>Unterschiede anzeigen (erweitert)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="148"/> <source>Show differences (URLs)</source> <translation>Unterschiede anzeigen (URLs)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="124"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation><b>Unterschiede anzeigen</b><p>Dies zeigt Unterschiede des lokalen Projektes zum Repository an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="140"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation><b>Unterschiede anzeigen (erweitert)</b><p>Dies zeigt Unterschiede von Revisionen des Projektes an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="156"/> <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> <translation><b>Unterschiede anzeigen (URLs)</b><p>Dies zeigt Unterschiede des Projektes zwischen zwei Repository-URLs.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="559"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="543"/> <source>Subversion (svn)</source> <translation>Subversion (svn)</translation> </message> @@ -58884,12 +58980,12 @@ <translation>Alle</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="66"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="62"/> <source>Language:</source> <translation>Sprache:</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="70"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="69"/> <source>GROUP</source> <translation>GRUPPE</translation> </message> @@ -58929,12 +59025,12 @@ <translation>Gruppe:</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="103"/> <source>Close dialog</source> <translation>Dialog schließen</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="103"/> <source>Do you really want to close the dialog?</source> <translation>Soll der Dialog wirklich geschlossen werden?</translation> </message> @@ -60600,27 +60696,27 @@ <context> <name>UnittestDialog</name> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.py" line="403"/> <source>Unittest</source> <translation>Modultest</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="266"/> + <location filename="../PyUnit/UnittestDialog.py" line="269"/> <source>You must enter a test suite file.</source> <translation>Sie müssen eine Modultestdatei angeben.</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="274"/> + <location filename="../PyUnit/UnittestDialog.py" line="277"/> <source>Preparing Testsuite</source> <translation>Bereite Modultest vor</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="514"/> + <location filename="../PyUnit/UnittestDialog.py" line="520"/> <source>Failure: {0}</source> <translation>Misserfolge: {0}</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="529"/> + <location filename="../PyUnit/UnittestDialog.py" line="535"/> <source>Error: {0}</source> <translation>Fehler: {0}</translation> </message> @@ -60635,12 +60731,12 @@ <translation>^Fehler: </translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="469"/> + <location filename="../PyUnit/UnittestDialog.py" line="475"/> <source>Running</source> <translation>Führe aus</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.py" line="403"/> <source><p>Unable to run test <b>{0}</b>.<br>{1}<br>{2}</p></source> <translation><p>Modultest <b>{0}</b> kann nicht ausgeführt werden.<br>{1}<br>{2}</p></translation> </message> @@ -60818,27 +60914,27 @@ <translation><b>Modultest anhalten</b><p>Dieser Knopf hält den laufenden Modultest an.</p></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="634"/> + <location filename="../PyUnit/UnittestDialog.py" line="640"/> <source>Show Source</source> <translation>Zeige Quelltext</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="206"/> + <location filename="../PyUnit/UnittestDialog.py" line="209"/> <source>Python Files (*.py);;All Files (*)</source> <translation>Python-Dateien (*.py);;Alle Dateien (*)</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="202"/> + <location filename="../PyUnit/UnittestDialog.py" line="205"/> <source>Python3 Files ({1});;Python2 Files ({0});;All Files (*)</source> <translation>Python 3-Dateien ({1});;Python 2-Dateien ({0});;Alle Dateien (*)</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="493"/> + <location filename="../PyUnit/UnittestDialog.py" line="499"/> <source>Ran {0} test in {1:.3f}s</source> <translation>{0} Test in {1:.3f}s ausgeführt</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="497"/> + <location filename="../PyUnit/UnittestDialog.py" line="503"/> <source>Ran {0} tests in {1:.3f}s</source> <translation>{0} Tests in {1:.3f}s ausgeführt</translation> </message> @@ -60873,17 +60969,17 @@ <translation>Anzahl der Tests, die unerwartet erfolgreich waren</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="544"/> + <location filename="../PyUnit/UnittestDialog.py" line="550"/> <source> Skipped: {0}</source> <translation> Übersprungen: {0}</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="559"/> + <location filename="../PyUnit/UnittestDialog.py" line="565"/> <source> Expected Failure</source> <translation> Erwarteter Mißerfolg</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="573"/> + <location filename="../PyUnit/UnittestDialog.py" line="579"/> <source> Unexpected Success</source> <translation> Unerwarteter Erfolg</translation> </message> @@ -63261,7 +63357,7 @@ <context> <name>Utilities</name> <message> - <location filename="../Utilities/__init__.py" line="1400"/> + <location filename="../Utilities/__init__.py" line="1403"/> <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> @@ -63487,9 +63583,9 @@ <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="81"/> <source><b>Globals Filter List</b> -<p>Select the variable types you want to be filtered out of the globals variables list.</p<</source> +<p>Select the variable types you want to be shown in the global variables viewer.</p<</source> <translation><b>Globale Filterliste</b> -<p>Wähle die Variablentypen die aus der globalen Variablenliste ausgefiltert werden sollen.</p></translation> +<p>Wähle die Variablentypen aus, die im Betrachter für globale Variablen angezeigt werden sollen.</p></translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="58"/> @@ -63499,25 +63595,30 @@ <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="61"/> <source><b>Locals Filter List</b> -<p>Select the variable types you want to be filtered out of the locals variables list.</p<</source> +<p>Select the variable types you want to be shown in the local variables viewer.</p<</source> <translation><b>Lokale Filterliste</b> -<p>Wähle die Variablentypen die aus der lokalen Variablenliste ausgefiltert werden sollen.</p></translation> +<p>Wähle die Variablentypen aus, die im Betrachter für lokale Variablen angezeigt werden sollen.</p></translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="48"/> - <source>&Globals Filter</source> - <translation>&Globale Filter</translation> + <source>&Globals Viewer</source> + <translation>&Globale Variablen</translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="38"/> - <source>&Locals Filter</source> - <translation>&Lokale Filter</translation> + <source>&Locals Viewer</source> + <translation>&Lokale Variablen</translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.py" line="42"/> <source>Save Default</source> <translation>Standard speichern</translation> </message> + <message> + <location filename="../Debugger/VariablesFilterDialog.ui" line="28"/> + <source>Select the variable types to be shown in the variables viewers:</source> + <translation>Wähle die Variablentypen aus, die in den Variablen Betrachter angezeigt werden sollen:</translation> + </message> </context> <context> <name>VariablesViewer</name> @@ -64098,7 +64199,7 @@ <translation>Aktualisieren</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="532"/> + <location filename="../VCS/ProjectHelper.py" line="533"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> @@ -64108,7 +64209,7 @@ <translation>Das aus dem Repository geladene Projekt enthält keine eric-Projektdatei (*.e4p). Soll sie erzeugt werden?</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="532"/> + <location filename="../VCS/ProjectHelper.py" line="533"/> <source>Switch</source> <translation>Umschalten</translation> </message> @@ -64188,17 +64289,17 @@ <context> <name>VersionControl</name> <message> - <location filename="../VCS/VersionControl.py" line="573"/> + <location filename="../VCS/VersionControl.py" line="563"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../VCS/VersionControl.py" line="573"/> + <location filename="../VCS/VersionControl.py" line="563"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="../VCS/VersionControl.py" line="704"/> + <location filename="../VCS/VersionControl.py" line="694"/> <source>Repository status checking is switched off</source> <translation>Repository-Statusüberprüfung ist ausgeschaltet</translation> </message> @@ -68954,8 +69055,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserView.py" line="551"/> - <source>Open Link in New Tab Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen Strg+LMK</translation> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/WebBrowserView.py" line="555"/> @@ -71429,24 +71530,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1459"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1426"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Vorgänger #{0}</b></td><td></td></tr> <tr><td><b>Änderungssatz</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marken</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Zweige</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1446"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -71455,24 +71556,24 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Spitze</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Änderungssatz</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Vorgänger</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -71483,12 +71584,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -71499,14 +71600,14 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2078"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Kopf #{0}</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2083"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Vorgänger #{0}</b></td><td></td></tr> @@ -72014,50 +72115,55 @@ <translation>vergleiche keine Typen, verwende 'isinstance()'</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="240"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="243"/> <source>do not assign a lambda expression, use a def</source> <translation>weise keine Lambda Ausdrücke zu, nutze def</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="243"/> - <source>ambiguous variable name '{0}'</source> - <translation>mehrdeutiger Variablenname '{0}'</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="246"/> - <source>ambiguous class definition '{0}'</source> - <translation>mehrdeutige Klassenbezeichnung '{0}'</translation> + <source>ambiguous variable name '{0}'</source> + <translation>mehrdeutiger Variablenname '{0}'</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="249"/> - <source>ambiguous function definition '{0}'</source> - <translation>mehrdeutige Funktionsbezeichnung '{0}'</translation> + <source>ambiguous class definition '{0}'</source> + <translation>mehrdeutige Klassenbezeichnung '{0}'</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="252"/> - <source>{0}: {1}</source> - <translation>{0}: {1}</translation> + <source>ambiguous function definition '{0}'</source> + <translation>mehrdeutige Funktionsbezeichnung '{0}'</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="255"/> + <source>{0}: {1}</source> + <translation>{0}: {1}</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="258"/> <source>{0}</source> <translation>{0}</translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="240"/> + <source>do not use bare except</source> + <translation>verwende kein leeres 'except'</translation> + </message> </context> <context> <name>subversion</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1606"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1586"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Repositoryinformationen</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Aktuelle Revision</b></td><td>{2}</td></tr><tr><td><b>Eingepflegte Revision</b></td><td>{3}</td></tr><tr><td><b>Einpflegedatum</b></td><td>{4}</td></tr><tr><td><b>Einpflegezeit</b></td><td>{5}</td></tr><tr><td><b>Letzter Autor</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1741"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1720"/> <source>unknown</source> <translation>Unbekannt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1746"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1725"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Repositoryinformationen</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Aktuelle Revision</b></td><td>{4}</td></tr><tr><td><b>Eingepflegte Revision</b></td><td>{5}</td></tr><tr><td><b>Einpflegedatum</b></td><td>{6}</td></tr><tr><td><b>Einpflegezeit</b></td><td>{7}</td></tr><tr><td><b>Letzter Autor</b></td><td>{8}</td></tr></table></translation> </message>
diff -r 852016bbdedb -r c307358a2ecc i18n/eric6_empty.ts --- a/i18n/eric6_empty.ts Fri Jan 27 19:18:52 2017 +0100 +++ b/i18n/eric6_empty.ts Fri Feb 03 19:20:59 2017 +0100 @@ -3480,231 +3480,231 @@ <context> <name>CodeStyleFixer</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="494"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> <source>Triple single quotes converted to triple double quotes.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> - <source>Introductory quotes corrected to be {0}"""</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="500"/> - <source>Single line docstring put on one line.</source> + <source>Introductory quotes corrected to be {0}"""</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="503"/> + <source>Single line docstring put on one line.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="506"/> <source>Period added to summary line.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> <source>Blank line before function/method docstring removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="509"/> - <source>Blank line inserted before class docstring.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="512"/> - <source>Blank line inserted after class docstring.</source> + <source>Blank line inserted before class docstring.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="515"/> - <source>Blank line inserted after docstring summary.</source> + <source>Blank line inserted after class docstring.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="518"/> - <source>Blank line inserted after last paragraph of docstring.</source> + <source>Blank line inserted after docstring summary.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="521"/> - <source>Leading quotes put on separate line.</source> + <source>Blank line inserted after last paragraph of docstring.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="524"/> - <source>Trailing quotes put on separate line.</source> + <source>Leading quotes put on separate line.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="527"/> + <source>Trailing quotes put on separate line.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> <source>Blank line before class docstring removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> - <source>Blank line after class docstring removed.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="536"/> - <source>Blank line after function/method docstring removed.</source> + <source>Blank line after class docstring removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="539"/> - <source>Blank line after last paragraph removed.</source> + <source>Blank line after function/method docstring removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="542"/> - <source>Tab converted to 4 spaces.</source> + <source>Blank line after last paragraph removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="545"/> - <source>Indentation adjusted to be a multiple of four.</source> + <source>Tab converted to 4 spaces.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="548"/> - <source>Indentation of continuation line corrected.</source> + <source>Indentation adjusted to be a multiple of four.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="551"/> - <source>Indentation of closing bracket corrected.</source> + <source>Indentation of continuation line corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="554"/> - <source>Missing indentation of continuation line corrected.</source> + <source>Indentation of closing bracket corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="557"/> - <source>Closing bracket aligned to opening bracket.</source> + <source>Missing indentation of continuation line corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="560"/> - <source>Indentation level changed.</source> + <source>Closing bracket aligned to opening bracket.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="563"/> - <source>Indentation level of hanging indentation changed.</source> + <source>Indentation level changed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="566"/> + <source>Indentation level of hanging indentation changed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="569"/> <source>Visual indentation corrected.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="584"/> + <source>Extraneous whitespace removed.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="581"/> - <source>Extraneous whitespace removed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="578"/> <source>Missing whitespace added.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="584"/> - <source>Whitespace around comment sign corrected.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="587"/> + <source>Whitespace around comment sign corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="590"/> <source>One blank line inserted.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="591"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> <source>%n blank line(s) inserted.</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="597"/> <source>%n superfluous lines removed</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="598"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="601"/> <source>Superfluous blank lines removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="601"/> - <source>Superfluous blank lines after function decorator removed.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="604"/> - <source>Imports were put on separate lines.</source> + <source>Superfluous blank lines after function decorator removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="607"/> - <source>Long lines have been shortened.</source> + <source>Imports were put on separate lines.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="610"/> + <source>Long lines have been shortened.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="613"/> <source>Redundant backslash in brackets removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="616"/> - <source>Compound statement corrected.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="619"/> - <source>Comparison to None/True/False corrected.</source> + <source>Compound statement corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="622"/> - <source>'{0}' argument added.</source> + <source>Comparison to None/True/False corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="625"/> - <source>'{0}' argument removed.</source> + <source>'{0}' argument added.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="628"/> - <source>Whitespace stripped from end of line.</source> + <source>'{0}' argument removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="631"/> - <source>newline added to end of file.</source> + <source>Whitespace stripped from end of line.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="634"/> - <source>Superfluous trailing blank lines removed from end of file.</source> + <source>newline added to end of file.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="637"/> + <source>Superfluous trailing blank lines removed from end of file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="640"/> <source>'<>' replaced by '!='.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="641"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="644"/> <source>Could not save the file! Skipping it. Reason: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="710"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="713"/> <source> no message defined for code '{0}'</source> <translation type="unfinished"></translation> </message> @@ -6942,197 +6942,197 @@ <context> <name>DocStyleChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="260"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="263"/> <source>module is missing a docstring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="262"/> - <source>public function/method is missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="265"/> - <source>private function/method may be missing a docstring</source> + <source>public function/method is missing a docstring</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="268"/> + <source>private function/method may be missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="271"/> <source>public class is missing a docstring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="270"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="273"/> <source>private class may be missing a docstring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="272"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="275"/> <source>docstring not surrounded by """</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="274"/> - <source>docstring containing \ not surrounded by r"""</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="277"/> - <source>docstring containing unicode character not surrounded by u"""</source> + <source>docstring containing \ not surrounded by r"""</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="280"/> + <source>docstring containing unicode character not surrounded by u"""</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="283"/> <source>one-liner docstring on multiple lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="282"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="285"/> <source>docstring has wrong indentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="284"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="287"/> <source>docstring does not contain a summary</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="328"/> + <source>docstring summary does not end with a period</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="291"/> + <source>docstring summary is not in imperative mood (Does instead of Do)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="295"/> + <source>docstring summary looks like a function's/method's signature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="298"/> + <source>docstring does not mention the return value type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="301"/> + <source>function/method docstring is separated by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="304"/> + <source>class docstring is not preceded by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="307"/> + <source>class docstring is not followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="362"/> + <source>docstring summary is not followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="313"/> + <source>last paragraph of docstring is not followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="317"/> + <source>private function/method is missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="320"/> + <source>private class is missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="322"/> + <source>leading quotes of docstring not on separate line</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="325"/> - <source>docstring summary does not end with a period</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="288"/> - <source>docstring summary is not in imperative mood (Does instead of Do)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="292"/> - <source>docstring summary looks like a function's/method's signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="295"/> - <source>docstring does not mention the return value type</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="298"/> - <source>function/method docstring is separated by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="301"/> - <source>class docstring is not preceded by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="304"/> - <source>class docstring is not followed by a blank line</source> + <source>trailing quotes of docstring not on separate line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="330"/> + <source>docstring summary does not start with '{0}'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="332"/> + <source>docstring does not contain a @return line but function/method returns something</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="336"/> + <source>docstring contains a @return line but function/method doesn't return anything</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="340"/> + <source>docstring does not contain enough @param/@keyparam lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="343"/> + <source>docstring contains too many @param/@keyparam lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="346"/> + <source>keyword only arguments must be documented with @keyparam lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="349"/> + <source>order of @param/@keyparam lines does not match the function/method signature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="352"/> + <source>class docstring is preceded by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="354"/> + <source>class docstring is followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="356"/> + <source>function/method docstring is preceded by a blank line</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="359"/> - <source>docstring summary is not followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="310"/> - <source>last paragraph of docstring is not followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="314"/> - <source>private function/method is missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="317"/> - <source>private class is missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="319"/> - <source>leading quotes of docstring not on separate line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="322"/> - <source>trailing quotes of docstring not on separate line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="327"/> - <source>docstring summary does not start with '{0}'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="329"/> - <source>docstring does not contain a @return line but function/method returns something</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="333"/> - <source>docstring contains a @return line but function/method doesn't return anything</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="337"/> - <source>docstring does not contain enough @param/@keyparam lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="340"/> - <source>docstring contains too many @param/@keyparam lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="343"/> - <source>keyword only arguments must be documented with @keyparam lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="346"/> - <source>order of @param/@keyparam lines does not match the function/method signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="349"/> - <source>class docstring is preceded by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="351"/> - <source>class docstring is followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="353"/> - <source>function/method docstring is preceded by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="356"/> <source>function/method docstring is followed by a blank line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="362"/> - <source>last paragraph of docstring is followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="365"/> + <source>last paragraph of docstring is followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="368"/> <source>docstring does not contain a @exception line but function/method raises an exception</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="369"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="372"/> <source>docstring contains a @exception line but function/method doesn't raise an exception</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="374"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="377"/> <source>{0}: {1}</source> <translation type="unfinished"></translation> </message> @@ -8895,892 +8895,892 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2878"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source>Open File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="340"/> + <location filename="../QScintilla/Editor.py" line="343"/> <source><p>The size of the file <b>{0}</b> is <b>{1} KB</b>. Do you really want to load it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="400"/> + <location filename="../QScintilla/Editor.py" line="403"/> <source><b>A Source Editor Window</b><p>This window is used to display and edit a source file. You can open as many of these as you like. The name of the file is displayed in the window's titlebar.</p><p>In order to set breakpoints just click in the space between the line numbers and the fold markers. Via the context menu of the margins they may be edited.</p><p>In order to set bookmarks just Shift click in the space between the line numbers and the fold markers.</p><p>These actions can be reversed via the context menu.</p><p>Ctrl clicking on a syntax error marker shows some info about this error.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="658"/> - <source>Undo</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="661"/> - <source>Redo</source> + <source>Undo</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="664"/> + <source>Redo</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="667"/> <source>Revert to last saved state</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="668"/> - <source>Cut</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="671"/> - <source>Copy</source> + <source>Cut</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="674"/> + <source>Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="677"/> <source>Paste</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="679"/> - <source>Indent</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="682"/> - <source>Unindent</source> + <source>Indent</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="685"/> - <source>Comment</source> + <source>Unindent</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="688"/> - <source>Uncomment</source> + <source>Comment</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="691"/> - <source>Stream Comment</source> + <source>Uncomment</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="694"/> + <source>Stream Comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="697"/> <source>Box Comment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="698"/> - <source>Select to brace</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="700"/> - <source>Select all</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="701"/> + <source>Select to brace</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="703"/> + <source>Select all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="704"/> <source>Deselect all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7242"/> + <location filename="../QScintilla/Editor.py" line="7249"/> <source>Check spelling...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="707"/> + <location filename="../QScintilla/Editor.py" line="710"/> <source>Check spelling of selection...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="711"/> + <location filename="../QScintilla/Editor.py" line="714"/> <source>Remove from dictionary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="715"/> + <location filename="../QScintilla/Editor.py" line="718"/> <source>Shorten empty lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="722"/> + <location filename="../QScintilla/Editor.py" line="725"/> <source>Use Monospaced Font</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="727"/> + <location filename="../QScintilla/Editor.py" line="730"/> <source>Autosave enabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="731"/> + <location filename="../QScintilla/Editor.py" line="734"/> <source>Typing aids enabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="738"/> + <location filename="../QScintilla/Editor.py" line="741"/> <source>Automatic Completion enabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="746"/> + <location filename="../QScintilla/Editor.py" line="749"/> <source>Calltip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="760"/> - <source>New Document View</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="763"/> + <source>New Document View</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="766"/> <source>New Document View (with new split)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="768"/> + <location filename="../QScintilla/Editor.py" line="771"/> <source>Close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="774"/> - <source>Save</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="777"/> - <source>Save As...</source> + <source>Save</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="780"/> + <source>Save As...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="783"/> <source>Save Copy...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="786"/> + <location filename="../QScintilla/Editor.py" line="789"/> <source>Open 'rejection' file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="790"/> - <source>Print Preview</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="793"/> + <source>Print Preview</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="796"/> <source>Print</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="816"/> - <source>Complete</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="819"/> + <source>Complete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="822"/> <source>Complete from Document</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="821"/> + <location filename="../QScintilla/Editor.py" line="824"/> <source>Complete from APIs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="823"/> + <location filename="../QScintilla/Editor.py" line="826"/> <source>Complete from Document and APIs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="837"/> + <location filename="../QScintilla/Editor.py" line="840"/> <source>Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="847"/> + <location filename="../QScintilla/Editor.py" line="850"/> <source>Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="857"/> - <source>Show</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="859"/> - <source>Code metrics...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="860"/> - <source>Code coverage...</source> + <source>Show</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="862"/> - <source>Show code coverage annotations</source> + <source>Code metrics...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="863"/> + <source>Code coverage...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="865"/> - <source>Hide code coverage annotations</source> + <source>Show code coverage annotations</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="868"/> + <source>Hide code coverage annotations</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="871"/> <source>Profile data...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="881"/> + <location filename="../QScintilla/Editor.py" line="884"/> <source>Diagrams</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="883"/> + <location filename="../QScintilla/Editor.py" line="886"/> <source>Class Diagram...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="885"/> + <location filename="../QScintilla/Editor.py" line="888"/> <source>Package Diagram...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="887"/> + <location filename="../QScintilla/Editor.py" line="890"/> <source>Imports Diagram...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="889"/> + <location filename="../QScintilla/Editor.py" line="892"/> <source>Application Diagram...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="893"/> + <location filename="../QScintilla/Editor.py" line="896"/> <source>Load Diagram...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="907"/> - <source>Languages</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="910"/> + <source>Languages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="913"/> <source>No Language</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="933"/> + <location filename="../QScintilla/Editor.py" line="936"/> <source>Guessed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1268"/> + <location filename="../QScintilla/Editor.py" line="1271"/> <source>Alternatives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="953"/> + <location filename="../QScintilla/Editor.py" line="956"/> <source>Encodings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="975"/> + <location filename="../QScintilla/Editor.py" line="978"/> <source>Re-Open With Encoding</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="994"/> + <location filename="../QScintilla/Editor.py" line="997"/> <source>End-of-Line Type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="998"/> + <location filename="../QScintilla/Editor.py" line="1001"/> <source>Unix</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1005"/> + <location filename="../QScintilla/Editor.py" line="1008"/> <source>Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1012"/> + <location filename="../QScintilla/Editor.py" line="1015"/> <source>Macintosh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1030"/> + <location filename="../QScintilla/Editor.py" line="1033"/> <source>Export as</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1153"/> + <location filename="../QScintilla/Editor.py" line="1156"/> <source>Toggle bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1155"/> + <location filename="../QScintilla/Editor.py" line="1158"/> <source>Next bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1157"/> + <location filename="../QScintilla/Editor.py" line="1160"/> <source>Previous bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1159"/> + <location filename="../QScintilla/Editor.py" line="1162"/> <source>Clear all bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1179"/> + <location filename="../QScintilla/Editor.py" line="1182"/> <source>Toggle breakpoint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1181"/> - <source>Toggle temporary breakpoint</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1184"/> + <source>Toggle temporary breakpoint</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1187"/> <source>Edit breakpoint...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5154"/> + <location filename="../QScintilla/Editor.py" line="5161"/> <source>Enable breakpoint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1189"/> + <location filename="../QScintilla/Editor.py" line="1192"/> <source>Next breakpoint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1191"/> + <location filename="../QScintilla/Editor.py" line="1194"/> <source>Previous breakpoint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1193"/> + <location filename="../QScintilla/Editor.py" line="1196"/> <source>Clear all breakpoints</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1162"/> + <location filename="../QScintilla/Editor.py" line="1165"/> <source>Goto syntax error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1164"/> + <location filename="../QScintilla/Editor.py" line="1167"/> <source>Show syntax error message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1166"/> - <source>Clear syntax error</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1169"/> - <source>Next warning</source> + <source>Clear syntax error</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="1172"/> + <source>Next warning</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1175"/> <source>Previous warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1174"/> + <location filename="../QScintilla/Editor.py" line="1177"/> <source>Show warning message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1176"/> + <location filename="../QScintilla/Editor.py" line="1179"/> <source>Clear warnings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1196"/> - <source>Next uncovered line</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1199"/> - <source>Previous uncovered line</source> + <source>Next uncovered line</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="1202"/> + <source>Previous uncovered line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1205"/> <source>Next task</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1204"/> - <source>Previous task</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1207"/> - <source>Next change</source> + <source>Previous task</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="1210"/> - <source>Previous change</source> + <source>Next change</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="1213"/> + <source>Previous change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1216"/> <source>LMB toggles bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1217"/> + <location filename="../QScintilla/Editor.py" line="1220"/> <source>LMB toggles breakpoints</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1253"/> + <location filename="../QScintilla/Editor.py" line="1256"/> <source>Export source</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1245"/> + <location filename="../QScintilla/Editor.py" line="1248"/> <source><p>No exporter available for the export format <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1253"/> + <location filename="../QScintilla/Editor.py" line="1256"/> <source>No export format given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1264"/> + <location filename="../QScintilla/Editor.py" line="1267"/> <source>Alternatives ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1284"/> + <location filename="../QScintilla/Editor.py" line="1287"/> <source>Pygments Lexer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1284"/> + <location filename="../QScintilla/Editor.py" line="1287"/> <source>Select the Pygments lexer to apply.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1752"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>Modification of Read Only file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1752"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2443"/> + <location filename="../QScintilla/Editor.py" line="2448"/> <source>Printing...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2460"/> - <source>Printing completed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2462"/> - <source>Error while printing</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2465"/> + <source>Printing completed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2467"/> + <source>Error while printing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2470"/> <source>Printing aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2823"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source>File Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2823"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2878"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3041"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source>Save File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2982"/> + <location filename="../QScintilla/Editor.py" line="2987"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3041"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4427"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4427"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4532"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Activating Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4532"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4581"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4581"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4852"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Activating Calltip Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4852"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5157"/> + <location filename="../QScintilla/Editor.py" line="5164"/> <source>Disable breakpoint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5531"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Code Coverage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5531"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Please select a coverage file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5594"/> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>Show Code Coverage Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5587"/> - <source>All lines have been covered.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="5594"/> + <source>All lines have been covered.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>There is no coverage file available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5709"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Profile Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5709"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Please select a profile file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5869"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>Syntax Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5869"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>No syntax error message available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6059"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6059"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6120"/> + <location filename="../QScintilla/Editor.py" line="6127"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6123"/> - <source>Warning: {0}</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6130"/> + <source>Warning: {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6137"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6184"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Macro Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6184"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Select a macro name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6212"/> + <location filename="../QScintilla/Editor.py" line="6219"/> <source>Load macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6255"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Macro files (*.macro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6235"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source>Error loading macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6226"/> + <location filename="../QScintilla/Editor.py" line="6233"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6235"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6255"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Save macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6272"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source>Save macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6272"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6288"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source>Error saving macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6288"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6301"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Start Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6301"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Macro recording is already active. Start new?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6327"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6327"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Enter name of the macro:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6455"/> + <location filename="../QScintilla/Editor.py" line="6462"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6461"/> + <location filename="../QScintilla/Editor.py" line="6468"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6465"/> + <location filename="../QScintilla/Editor.py" line="6472"/> <source>File changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6629"/> + <location filename="../QScintilla/Editor.py" line="6636"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6769"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6769"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6790"/> + <location filename="../QScintilla/Editor.py" line="6797"/> <source>Resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6792"/> - <source>Add file...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6794"/> - <source>Add files...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6796"/> - <source>Add aliased file...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6799"/> - <source>Add localized resource...</source> + <source>Add file...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6801"/> + <source>Add files...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="6803"/> + <source>Add aliased file...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6806"/> + <source>Add localized resource...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6810"/> <source>Add resource frame</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6822"/> + <location filename="../QScintilla/Editor.py" line="6829"/> <source>Add file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6838"/> + <location filename="../QScintilla/Editor.py" line="6845"/> <source>Add file resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6866"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Add aliased file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6866"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6930"/> + <location filename="../QScintilla/Editor.py" line="6937"/> <source>Package Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6930"/> + <location filename="../QScintilla/Editor.py" line="6937"/> <source>Include class attributes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6950"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Imports Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6950"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Include imports from external modules?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6964"/> + <location filename="../QScintilla/Editor.py" line="6971"/> <source>Application Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6964"/> + <location filename="../QScintilla/Editor.py" line="6971"/> <source>Include module names?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7245"/> + <location filename="../QScintilla/Editor.py" line="7252"/> <source>Add to dictionary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7247"/> + <location filename="../QScintilla/Editor.py" line="7254"/> <source>Ignore All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7659"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7659"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7746"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7746"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -9848,7 +9848,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> <source>Add from installed APIs</source> <translation type="unfinished"></translation> </message> @@ -9858,7 +9858,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> <source>Add from Plugin APIs</source> <translation type="unfinished"></translation> </message> @@ -9868,7 +9868,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="299"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="301"/> <source>Compile APIs</source> <translation type="unfinished"></translation> </message> @@ -9883,22 +9883,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="238"/> <source>Select from the list of installed API files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> <source>There are no APIs installed yet. Selection is not available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> <source>Select from the list of API files installed by plugins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="314"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="316"/> <source>Cancel compilation</source> <translation type="unfinished"></translation> </message> @@ -10065,6 +10065,89 @@ </message> </context> <context> + <name>EditorButtonsWidget</name> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="175"/> + <source>Bold</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="177"/> + <source>Italic</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="179"/> + <source>Strike Through</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="182"/> + <source>Header 1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="184"/> + <source>Header 2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="186"/> + <source>Header 3</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="188"/> + <source>Header</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="193"/> + <source>Inline Code</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="195"/> + <source>Code Block</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="197"/> + <source>Quote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="200"/> + <source>Add Hyperlink</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="202"/> + <source>Add Horizontal Line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="204"/> + <source>Add Image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="207"/> + <source>Add Bulleted List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="209"/> + <source>Add Numbered List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="273"/> + <source>Level {0}</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>EditorCalltipsPage</name> <message> <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="17"/> @@ -10873,7 +10956,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightersPage.py" line="142"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightersPage.py" line="146"/> <source>Alternative</source> <translation type="unfinished"></translation> </message> @@ -10936,7 +11019,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> <source>Fill to end of line</source> <translation type="unfinished"></translation> </message> @@ -11066,42 +11149,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="351"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="355"/> <source>Enabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="352"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="356"/> <source>Disabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> <source>Select fill to end of line for all styles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465"/> <source>Export Highlighting Styles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="477"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="481"/> <source>Highlighting styles file (*.e4h)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465"/> <source><p>The highlighting styles could not be exported to file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="497"/> <source>Import Highlighting Styles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="497"/> <source><p>The highlighting styles could not be read from file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -11193,12 +11276,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1048"/> <source>Select whether folding of comments shall be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1051"/> <source>Fold comments</source> <translation type="unfinished"></translation> </message> @@ -11208,22 +11291,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="990"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/> <source>Select whether folding at else statement should be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/> <source>Fold at else</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="522"/> <source>Select whether folding of preprocessor directives shall be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="525"/> <source>Fold preprocessor directives</source> <translation type="unfinished"></translation> </message> @@ -11313,7 +11396,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="194"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/> <source>Highlight escape sequences</source> <translation type="unfinished"></translation> </message> @@ -11453,340 +11536,360 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/> <source>Pascal Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="503"/> - <source>Select to enable smart highlighting of keywords</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/> - <source>Smart Highlighting</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="516"/> - <source>Perl Lexer Properties</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/> - <source>Select to enable folding of Perl packages</source> + <source>Select to enable smart highlighting of keywords</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="535"/> - <source>Fold packages</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="542"/> - <source>Select to enable folding of Perl POD blocks</source> + <source>Smart Highlighting</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/> + <source>Perl Lexer Properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="561"/> + <source>Select to enable folding of Perl packages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="564"/> + <source>Fold packages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="571"/> + <source>Select to enable folding of Perl POD blocks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="574"/> <source>Fold POD blocks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="565"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="594"/> <source>PostScript Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="581"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="610"/> <source>Select to mark tokens</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="584"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="613"/> <source>Mark Tokens</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="593"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="622"/> <source>PostScript Level:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="600"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="629"/> <source>Select the PostScript level</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="637"/> - <source>Povray Lexer Properties</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="643"/> - <source>Select whether folding of directives shall be possible</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="646"/> - <source>Fold directives</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/> - <source>Properties Lexer Properties</source> + <source>Povray Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/> - <source>Select to allow initial spaces in a line</source> + <source>Select whether folding of directives shall be possible</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/> - <source>Allow initial spaces</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="685"/> - <source>Python Lexer Properties</source> + <source>Fold directives</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="695"/> + <source>Properties Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/> - <source>Select whether folding of strings shall be possible</source> + <source>Select to allow initial spaces in a line</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/> - <source>Fold strings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/> - <source>Select whether folding of triple quoted strings shall be possible</source> + <source>Allow initial spaces</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> + <source>Python Lexer Properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="730"/> + <source>Select whether folding of strings shall be possible</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="733"/> + <source>Fold strings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="740"/> + <source>Select whether folding of triple quoted strings shall be possible</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="743"/> <source>Fold triple quoted strings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="721"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="750"/> <source>Select whether text should be autoindented after a ':'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="724"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="753"/> <source>Auto indentation after ':'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="760"/> <source>Select to allow strings to span newline characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="734"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="763"/> <source>Strings may span newline characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="741"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="770"/> <source>Select to allow Python v2 unicode string literals (e.g. u"utf8")</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="744"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="773"/> <source>Allow v2 unicode string literals</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="751"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="780"/> <source>Select to allow Python v3 binary and octal literals (e.g. 0b1011, 0o712)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="754"/> - <source>Allow v3 binary and octal literals</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="761"/> - <source>Select to allow Python v3 bytes string literals (e.g. b"bytes")</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="764"/> - <source>Allow v3 bytes string literals</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="771"/> - <source>Select to highlight sub-identifiers defined in keyword set 2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="774"/> - <source>Highlight sub-identifiers</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/> + <source>Allow v3 binary and octal literals</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="790"/> + <source>Select to allow Python v3 bytes string literals (e.g. b"bytes")</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="793"/> + <source>Allow v3 bytes string literals</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="800"/> + <source>Select to highlight sub-identifiers defined in keyword set 2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="803"/> + <source>Highlight sub-identifiers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="812"/> <source>Highlight bad indentation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="796"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="825"/> <source>Select whether bad indentation shall be highlighted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="808"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="837"/> <source>Ruby Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="827"/> - <source>SQL Lexer Properties</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="853"/> - <source>Select whether only BEGIN blocks can be folded</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/> + <source>SQL Lexer Properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="882"/> + <source>Select whether only BEGIN blocks can be folded</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="885"/> <source>Only BEGIN blocks can be folded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="863"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="892"/> <source>Select to enable Backslash Escapes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="866"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="895"/> <source>Backslash Escapes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="873"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="902"/> <source>Select if words may contain dots</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="876"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="905"/> <source>Words may contain dots</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="883"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="912"/> <source>Select to allow '#' as a comment character</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="886"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="915"/> <source>Allow '#' as comment character</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="893"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="922"/> <source>Select to enable quoted identifiers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="896"/> - <source>Enable quoted identifiers</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="906"/> - <source>TCL Lexer Properties</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="925"/> - <source>TeX Lexer Properties</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="941"/> - <source>Select to treat comments as TeX source</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="944"/> - <source>Treat comments as TeX source</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="951"/> - <source>Select to treat \if<unknown> as a command</source> + <source>Enable quoted identifiers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="935"/> + <source>TCL Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="954"/> - <source>Treat \if<unknown> as command</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="964"/> - <source>VHDL Lexer Properties</source> + <source>TeX Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/> - <source>Select whether folding of blocks at a parenthesis shall be possible</source> + <source>Select to treat comments as TeX source</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/> - <source>Fold at parenthesis</source> + <source>Treat comments as TeX source</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/> - <source>Select whether folding of begin blocks shall be possible</source> + <source>Select to treat \if<unknown> as a command</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/> + <source>Treat \if<unknown> as command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/> + <source>VHDL Lexer Properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="999"/> + <source>Select whether folding of blocks at a parenthesis shall be possible</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1002"/> + <source>Fold at parenthesis</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1009"/> + <source>Select whether folding of begin blocks shall be possible</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1012"/> <source>Fold at begin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1013"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1042"/> <source>YAML Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>No Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Inconsistent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Tabs after Spaces</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Spaces</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Tabs</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/> + <source>JSON</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="483"/> + <source>Select to enable highlighting of line/block comments</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="486"/> + <source>Highlight comments</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/> + <source>Select to enable highlighting of escape sequences in strings</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSearchPage</name> @@ -12891,6 +12994,16 @@ <source>Indicator in Line Number Margin</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1866"/> + <source>Select to hide the Format Buttons bar when formatting is not supported</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1869"/> + <source>Hide Format Buttons bar when not supported</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSyntaxPage</name> @@ -13156,7 +13269,7 @@ <context> <name>EmailDialog</name> <message> - <location filename="../UI/EmailDialog.py" line="339"/> + <location filename="../UI/EmailDialog.py" line="346"/> <source>Send bug report</source> <translation type="unfinished"></translation> </message> @@ -13251,27 +13364,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="293"/> + <location filename="../UI/EmailDialog.py" line="300"/> <source>Mail Server Password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="293"/> + <location filename="../UI/EmailDialog.py" line="300"/> <source>Enter your mail server password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="311"/> + <location filename="../UI/EmailDialog.py" line="318"/> <source><p>Authentication failed.<br>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="339"/> + <location filename="../UI/EmailDialog.py" line="346"/> <source><p>Message could not be sent.<br>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="357"/> + <location filename="../UI/EmailDialog.py" line="364"/> <source>Attach file</source> <translation type="unfinished"></translation> </message> @@ -13294,100 +13407,125 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/> - <source>Outgoing mail server port:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="60"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="124"/> <source>Enter the port of the mail server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="92"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/> <source>Email address:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="99"/> - <source>Enter your email address</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="106"/> - <source>Signature:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="116"/> - <source>Enter your email signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="128"/> - <source>Select to use TLS</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="131"/> - <source>Use TLS</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="138"/> - <source>Select to authenticatate against the mail server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="141"/> - <source>Mail server needs authentication</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="153"/> - <source>Username:</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/> + <source>Enter your email address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="170"/> + <source>Signature:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="180"/> + <source>Enter your email signature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="104"/> + <source>Select to use TLS</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="192"/> + <source>Select to authenticatate against the mail server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="195"/> + <source>Mail server needs authentication</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="204"/> + <source>Username:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="211"/> <source>Enter your mail server username</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="173"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="218"/> <source>Password:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="183"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="225"/> <source>Enter your password for accessing the mail server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="193"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="235"/> <source>Press to test the login data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="196"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="238"/> <source>Test Login</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/> <source>Login Test</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="138"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="204"/> <source>The login test succeeded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/> <source><p>The login test failed.<br>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/> + <source>Encryption Method:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="81"/> + <source>Select to use no encryption</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="84"/> + <source>None</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="94"/> + <source>Select to use SSL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="97"/> + <source>SSL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="107"/> + <source>TLS</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="117"/> + <source>Port:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EricAccessHandler</name> @@ -14282,54 +14420,54 @@ <context> <name>ExceptionsFilterDialog</name> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="13"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="14"/> <source>Exceptions Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="16"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="17"/> <source><b>Exception Filter</b> <p>This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the "Start Debugging" dialog is unchecked, no exception will be reported at all.</p> <p>Please note, that unhandled exceptions are always highlighted independent of these settings.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="27"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="28"/> <source>List of exceptions that shall be highlighted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="42"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="41"/> <source>Press to add the entered exception to the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="45"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="44"/> <source>Add</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="52"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="51"/> <source>Enter an exception type that shall be highlighted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="66"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="61"/> <source>Press to delete the selected exception from the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="69"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="64"/> <source>Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="76"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="71"/> <source>Press to delete all exceptions from the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="79"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="74"/> <source>Delete All</source> <translation type="unfinished"></translation> </message> @@ -21304,7 +21442,7 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1822"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -21369,372 +21507,372 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1030"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="997"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1057"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1133"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1359"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2730"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2022"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2427"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2451"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2475"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2604"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2623"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2578"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2625"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2710"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2727"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2759"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2959"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3614"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3924"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -24017,7 +24155,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> @@ -24087,7 +24225,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/> <source>Revision</source> <translation type="unfinished"></translation> </message> @@ -24097,7 +24235,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> <source>Author</source> <translation type="unfinished"></translation> </message> @@ -24107,7 +24245,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="103"/> <source>Message</source> <translation type="unfinished"></translation> </message> @@ -24117,613 +24255,439 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="285"/> <source>Action</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="290"/> <source>Path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="295"/> <source>Copy from</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="306"/> <source>Press to get the next bunch of log entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="309"/> <source>&Next</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="316"/> <source>Enter the limit of entries to fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="335"/> <source>Select to stop listing log messages at a copy or move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="338"/> <source>Stop on Copy/Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="378"/> <source>Press to generate a diff to the first parent revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="381"/> <source>Diff to Parent &1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> <source>Press to generate a diff to the second parent revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="391"/> <source>Diff to Parent &2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="398"/> <source>Press to compare two revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="401"/> <source>&Compare Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="444"/> <source>Select to show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="421"/> <source>Select action from menu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="462"/> <source>Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="468"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="484"/> <source>Input</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="474"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="506"/> <source>Press to send the input to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="477"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="509"/> <source>&Send</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="512"/> <source>Alt+S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="519"/> <source>Enter data to be sent to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="526"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="529"/> <source>&Password Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="532"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="77"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="90"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Find</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> - <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="147"/> <source>All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> <source>Added</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169"/> <source>Deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source>Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174"/> <source>Draft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> <source>Public</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> - <source>Secret</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/> + <source>Secret</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1899"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="227"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> - <source>Tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="204"/> - <source>Tag the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1773"/> - <source>Switch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="209"/> - <source>Switch the working directory to the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1871"/> - <source>Pull Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="230"/> - <source>Pull changes from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/> + <source>Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="235"/> + <source>Tag the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1951"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="240"/> + <source>Switch the working directory to the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2049"/> + <source>Pull Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="261"/> + <source>Pull changes from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="265"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="274"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="666"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="747"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="669"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="750"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="753"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="993"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="993"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="983"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1087"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2091"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2192"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2192"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1852"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2030"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2091"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> <source>Fetch changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="291"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="245"/> <source>Define Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="248"/> <source>Bookmark the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250"/> <source>Move Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253"/> <source>Move bookmark to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1972"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1972"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1816"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1994"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1816"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1994"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1937"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>HgLogDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="14"/> - <source>Mercurial Log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="26"/> - <source>Log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="32"/> - <source><b>Mercurial Log</b><p>This shows the output of the hg log command. By clicking on the links you may show the difference between revisions.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="45"/> - <source>Select to show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="48"/> - <source>Show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="61"/> - <source>Errors</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="67"/> - <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="83"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="105"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="108"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="111"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="118"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="125"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="128"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="131"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="64"/> - <source><b>Processing your request, please wait...</b></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="74"/> - <source>Revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="270"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> - <source>Could not start the hg executable.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="276"/> - <source>Mercurial Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/> - <source>No log available for '{0}'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="344"/> - <source>diff to {0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="352"/> - <source>Phase: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="355"/> - <source>Branch: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="358"/> - <source>Tags: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="361"/> - <source>Bookmarks: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="364"/> - <source>Parents: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="367"/> - <source><i>Author: {0}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="371"/> - <source><i>Date: {0}, {1}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="382"/> - <source>Added {0} (copied from {1})<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="387"/> - <source>Added {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="393"/> - <source>Modified {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="399"/> - <source>Deleted {0}<br /> -</source> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr><tr><td><b>Children</b></td><td>{5}</td></tr>{6}</table></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="368"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> + <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> </context> @@ -25086,127 +25050,122 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="605"/> <source>Version Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="617"/> <source>Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> <source>Add to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628"/> <source>Remove from repository (and disk)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Remove from repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="539"/> <source>Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="541"/> <source>Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="548"/> - <source>Show log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="552"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="544"/> <source>Show log browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> <source>Show status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="639"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="329"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="651"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="643"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="338"/> <source>Show differences side-by-side (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="343"/> <source>Show annotated file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="653"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="656"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="663"/> + <source>Select all local file entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="665"/> + <source>Select all versioned file entries</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> - <source>Re-Merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> - <source>Select all local file entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673"/> - <source>Select all versioned file entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675"/> <source>Select all local directory entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="669"/> <source>Select all versioned directory entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="672"/> <source>Configure...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Do you really want to remove these files from the repository?</source> <translation type="unfinished"></translation> </message> @@ -25370,1266 +25329,1246 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> - <source>Show log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> - <source>Show &log</source> + <source>Show log browser</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> - <source>Show the log of the local project</source> + <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> - <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> - <source>Show log browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> - <source>Show a dialog to browse the log of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show &difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> + <source>Show status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> + <source>Show &status...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <source>Show the status of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> - <source>Show status</source> + <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> - <source>Show &status...</source> + <source>Show summary...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> - <source>Show the status of the local project</source> + <source>Show summary information of the working directory status</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> - <source>Show Summary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> - <source>Show summary...</source> + <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> + <source>Show heads</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> - <source>Show summary information of the working directory status</source> + <source>Show the heads of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> - <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> - <source>Show heads</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> - <source>Show the heads of the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357"/> <source>Show parents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Show the parents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="371"/> <source>Show tip</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <source>Show the tip of the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> + <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <source>Re&vert changes</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> - <source>Show the tip of the repository</source> + <source>Revert all changes made to the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> - <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> - <source>Revert changes</source> + <source>Merge</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> - <source>Re&vert changes</source> + <source>Mer&ge changes...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> - <source>Revert all changes made to the local project</source> + <source>Merge changes of a revision into the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> - <source>Merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> - <source>Mer&ge changes...</source> + <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> + <source>Cancel uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> - <source>Merge changes of a revision into the local project</source> + <source>Cancel an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> - <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> + <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>Cancel uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> - <source>Cancel an uncommitted merge and lose all changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/> - <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <source>Re-Merge all conflicting, unresolved files of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> + <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> - <source>Re-Merge all conflicting, unresolved files of the project</source> + <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> - <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> + <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Show conflicts</source> + <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Show conflicts...</source> + <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> - <source>Show a dialog listing all files with conflicts</source> + <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> - <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Con&flicts resolved</source> + <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> - <source>Mark all conflicts of the local project as resolved</source> + <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <source>Tag in repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> - <source>Conflicts unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> - <source>Mark all conflicts of the local project as unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> - <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> + <source>&Tag in repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <source>Tag the local project in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> - <source>Tag in repository</source> + <source>List tags</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> - <source>&Tag in repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> - <source>Tag the local project in the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> - <source>List tags</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>List branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>List branches...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> + <source>List branches of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create &branch...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> - <source>List branches of the project</source> + <source>Create a new branch for the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Create branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Create &branch...</source> + <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> + <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> - <source>Create a new branch for the local project in the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> - <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> - <source>Push new branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> + <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> + <source>Close branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Close the current branch of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> - <source>Close branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> - <source>Close the current branch of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> <source>Show current branch</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Show the current branch of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <source>S&witch...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> - <source>Show the current branch of the project</source> + <source>Switch the working directory to another revision</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> - <source>Switch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> - <source>S&witch...</source> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Cleanup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Cleanu&p</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Switch the working directory to another revision</source> + <source>Cleanup the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> - <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source>Cleanup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source>Cleanu&p</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> - <source>Cleanup the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <source>Execute command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <source>E&xecute command...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <source>Execute an arbitrary Mercurial command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>Execute command</source> + <source>Configure</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>E&xecute command...</source> + <source>Configure...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> - <source>Execute an arbitrary Mercurial command</source> + <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> + <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Configure</source> + <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Configure...</source> + <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> - <source>Show the configuration dialog with the Mercurial page selected</source> + <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> - <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source>Edit user configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source>Edit user configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> - <source>Show an editor to edit the user configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <source>Show an editor to edit the repository configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Edit repository configuration</source> + <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Edit repository configuration...</source> + <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> - <source>Show an editor to edit the repository configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> + <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> + <source>Show paths</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> + <source>Show paths...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> + <source>Show the aliases for remote repositories</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> - <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> - <source>Show paths</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> - <source>Show paths...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> - <source>Show the aliases for remote repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> - <source>Create a .hgignore file with default values</source> + <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> - <source>Create changegroup...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> - <source>Create changegroup file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1793"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <source>Mark as "good"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> - <source>Apply one or several changegroup files</source> + <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> - <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source>Mark as "good"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source>Mark as "good"...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> + <source>Serve the project repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/> + <source><b>Serve project repository</b><p>This serves the project repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1849"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> - <source>Serve the project repository</source> + <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> - <source><b>Serve project repository</b><p>This serves the project repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1866"/> - <source>Import Patch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> - <source>Import Patch...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> - <source>Import a patch from a patch file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Export Patches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <source>Export revisions to patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> - <source>Export Patches</source> + <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> - <source>Export Patches...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1889"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> - <source>Change the phase of revisions</source> + <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> - <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1906"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <source>Add</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <source>Add...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <source>Add a sub-repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Add</source> + <source>Remove</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Add...</source> + <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> - <source>Add a sub-repository</source> + <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> - <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> - <source>Remove</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> - <source>Remove...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> - <source>Remove sub-repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <source>List bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <source>List bookmarks...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <source>List bookmarks of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>List bookmarks</source> + <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>List bookmarks...</source> + <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> - <source>List bookmarks of the project</source> + <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Define bookmark</source> + <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Define bookmark...</source> + <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> - <source>Define a bookmark for the project</source> + <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Delete bookmark</source> + <source>Rename bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Delete bookmark...</source> + <source>Rename bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <source>Delete a bookmark of the project</source> + <source>Rename a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Rename bookmark</source> + <source>Move bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Rename bookmark...</source> + <source>Move bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> - <source>Rename a bookmark of the project</source> + <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source>Move bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source>Move bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> - <source>Move a bookmark of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1144"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> <source>Show incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Pull bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1300"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1316"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> + <source>Bisect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <source>Tags</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> - <source>Bisect</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345"/> - <source>Tags</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/> <source>Graft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> <source>Manage Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>Mercurial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1627"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1610"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1869"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> @@ -29668,6 +29607,42 @@ </message> </context> <context> + <name>HtmlProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/HtmlProvider.py" line="388"/> + <source>Create List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HtmlProvider.py" line="388"/> + <source>Enter desired number of list elements:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HyperlinkMarkupDialog</name> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="14"/> + <source>Insert Hyperlink</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="23"/> + <source>Link Text:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="33"/> + <source>Link Target:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="43"/> + <source>Link Title:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>IExplorerImporter</name> <message> <location filename="../WebBrowser/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="40"/> @@ -29869,1063 +29844,1088 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="128"/> + <location filename="../IconEditor/IconEditorWindow.py" line="130"/> <source>Graphic Interchange Format File (*.gif)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="129"/> - <source>Windows Icon File (*.ico)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="130"/> - <source>JPEG File (*.jpg)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="131"/> - <source>JPEG File (*.jpeg)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="132"/> - <source>Multiple-Image Network Graphics File (*.mng)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="133"/> - <source>Portable Bitmap File (*.pbm)</source> + <source>Windows Icon File (*.ico)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="134"/> - <source>Paintbrush Bitmap File (*.pcx)</source> + <source>JPEG File (*.jpg)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="135"/> - <source>Portable Graymap File (*.pgm)</source> + <source>JPEG File (*.jpeg)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="136"/> - <source>Portable Network Graphics File (*.png)</source> + <source>Multiple-Image Network Graphics File (*.mng)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="137"/> - <source>Portable Pixmap File (*.ppm)</source> + <source>Portable Bitmap File (*.pbm)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="138"/> - <source>Silicon Graphics Image File (*.sgi)</source> + <source>Paintbrush Bitmap File (*.pcx)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="139"/> - <source>Scalable Vector Graphics File (*.svg)</source> + <source>Portable Graymap File (*.pgm)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="140"/> - <source>Compressed Scalable Vector Graphics File (*.svgz)</source> + <source>Portable Network Graphics File (*.png)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="141"/> + <source>Portable Pixmap File (*.ppm)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="142"/> - <source>Targa Graphic File (*.tga)</source> + <source>Silicon Graphics Image File (*.sgi)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="143"/> - <source>TIFF File (*.tif)</source> + <source>Scalable Vector Graphics File (*.svg)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="144"/> - <source>TIFF File (*.tiff)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="145"/> - <source>WAP Bitmap File (*.wbmp)</source> + <source>Compressed Scalable Vector Graphics File (*.svgz)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="146"/> - <source>X11 Bitmap File (*.xbm)</source> + <source>Targa Graphic File (*.tga)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="147"/> + <source>TIFF File (*.tif)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="148"/> + <source>TIFF File (*.tiff)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="149"/> + <source>WAP Bitmap File (*.wbmp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="151"/> + <source>X11 Bitmap File (*.xbm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="152"/> <source>X11 Pixmap File (*.xpm)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="158"/> + <location filename="../IconEditor/IconEditorWindow.py" line="163"/> <source>All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>New</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>&New</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>Ctrl+N</source> <comment>File|New</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="196"/> + <location filename="../IconEditor/IconEditorWindow.py" line="201"/> <source>Create a new icon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="197"/> + <location filename="../IconEditor/IconEditorWindow.py" line="202"/> <source><b>New</b><p>This creates a new icon.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="204"/> + <location filename="../IconEditor/IconEditorWindow.py" line="209"/> <source>New Window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="204"/> - <source>New &Window</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="209"/> + <source>New &Window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="214"/> <source>Open a new icon editor window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="211"/> + <location filename="../IconEditor/IconEditorWindow.py" line="216"/> <source><b>New Window</b><p>This opens a new icon editor window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>&Open...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>Ctrl+O</source> <comment>File|Open</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="224"/> + <location filename="../IconEditor/IconEditorWindow.py" line="229"/> <source>Open an icon file for editing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="225"/> + <location filename="../IconEditor/IconEditorWindow.py" line="230"/> <source><b>Open File</b><p>This opens a new icon file for editing. It pops up a file selection dialog.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>&Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>Ctrl+S</source> <comment>File|Save</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="239"/> + <location filename="../IconEditor/IconEditorWindow.py" line="244"/> <source>Save the current icon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="240"/> + <location filename="../IconEditor/IconEditorWindow.py" line="245"/> <source><b>Save File</b><p>Save the contents of the icon editor window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Save As</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Save &As...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Shift+Ctrl+S</source> <comment>File|Save As</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="253"/> + <location filename="../IconEditor/IconEditorWindow.py" line="258"/> <source>Save the current icon to a new file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="255"/> + <location filename="../IconEditor/IconEditorWindow.py" line="260"/> <source><b>Save As...</b><p>Saves the current icon to a new file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>Close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>&Close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>Ctrl+W</source> <comment>File|Close</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="268"/> + <location filename="../IconEditor/IconEditorWindow.py" line="273"/> <source>Close the current icon editor window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="270"/> + <location filename="../IconEditor/IconEditorWindow.py" line="275"/> <source><b>Close</b><p>Closes the current icon editor window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="277"/> + <location filename="../IconEditor/IconEditorWindow.py" line="282"/> <source>Close All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="277"/> + <location filename="../IconEditor/IconEditorWindow.py" line="282"/> <source>Close &All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="281"/> + <location filename="../IconEditor/IconEditorWindow.py" line="286"/> <source>Close all icon editor windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="283"/> + <location filename="../IconEditor/IconEditorWindow.py" line="288"/> <source><b>Close All</b><p>Closes all icon editor windows except the first one.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="290"/> + <location filename="../IconEditor/IconEditorWindow.py" line="295"/> <source>Close Others</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="294"/> + <location filename="../IconEditor/IconEditorWindow.py" line="299"/> <source>Close all other icon editor windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="296"/> + <location filename="../IconEditor/IconEditorWindow.py" line="301"/> <source><b>Close Others</b><p>Closes all other icon editor windows.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>&Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>Ctrl+Q</source> <comment>File|Quit</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="309"/> + <location filename="../IconEditor/IconEditorWindow.py" line="314"/> <source>Quit the icon editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="310"/> + <location filename="../IconEditor/IconEditorWindow.py" line="315"/> <source><b>Quit</b><p>Quit the icon editor.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Undo</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>&Undo</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Ctrl+Z</source> <comment>Edit|Undo</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Alt+Backspace</source> <comment>Edit|Undo</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="329"/> + <location filename="../IconEditor/IconEditorWindow.py" line="334"/> <source>Undo the last change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="330"/> + <location filename="../IconEditor/IconEditorWindow.py" line="335"/> <source><b>Undo</b><p>Undo the last change done.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>Redo</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>&Redo</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>Ctrl+Shift+Z</source> <comment>Edit|Redo</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="343"/> + <location filename="../IconEditor/IconEditorWindow.py" line="348"/> <source>Redo the last change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="344"/> + <location filename="../IconEditor/IconEditorWindow.py" line="349"/> <source><b>Redo</b><p>Redo the last change done.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Cut</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Cu&t</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Ctrl+X</source> <comment>Edit|Cut</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Shift+Del</source> <comment>Edit|Cut</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="358"/> + <location filename="../IconEditor/IconEditorWindow.py" line="363"/> <source>Cut the selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="359"/> + <location filename="../IconEditor/IconEditorWindow.py" line="364"/> <source><b>Cut</b><p>Cut the selected image area to the clipboard.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Ctrl+C</source> <comment>Edit|Copy</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Ctrl+Ins</source> <comment>Edit|Copy</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="373"/> + <location filename="../IconEditor/IconEditorWindow.py" line="378"/> <source>Copy the selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="374"/> + <location filename="../IconEditor/IconEditorWindow.py" line="379"/> <source><b>Copy</b><p>Copy the selected image area to the clipboard.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Paste</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>&Paste</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Ctrl+V</source> <comment>Edit|Paste</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Shift+Ins</source> <comment>Edit|Paste</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="388"/> + <location filename="../IconEditor/IconEditorWindow.py" line="393"/> <source>Paste the clipboard image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="389"/> + <location filename="../IconEditor/IconEditorWindow.py" line="394"/> <source><b>Paste</b><p>Paste the clipboard image.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="396"/> + <location filename="../IconEditor/IconEditorWindow.py" line="401"/> <source>Paste as New</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="396"/> + <location filename="../IconEditor/IconEditorWindow.py" line="401"/> <source>Paste as &New</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="400"/> + <location filename="../IconEditor/IconEditorWindow.py" line="405"/> <source>Paste the clipboard image replacing the current one</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="402"/> + <location filename="../IconEditor/IconEditorWindow.py" line="407"/> <source><b>Paste as New</b><p>Paste the clipboard image replacing the current one.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Clear</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Cl&ear</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Alt+Shift+C</source> <comment>Edit|Clear</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="416"/> + <location filename="../IconEditor/IconEditorWindow.py" line="421"/> <source>Clear the icon image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="417"/> + <location filename="../IconEditor/IconEditorWindow.py" line="422"/> <source><b>Clear</b><p>Clear the icon image and set it to be completely transparent.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>Select All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>&Select All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>Ctrl+A</source> <comment>Edit|Select All</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="431"/> + <location filename="../IconEditor/IconEditorWindow.py" line="436"/> <source>Select the complete icon image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="433"/> + <location filename="../IconEditor/IconEditorWindow.py" line="438"/> <source><b>Select All</b><p>Selects the complete icon image.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="440"/> + <location filename="../IconEditor/IconEditorWindow.py" line="445"/> <source>Change Size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="440"/> + <location filename="../IconEditor/IconEditorWindow.py" line="445"/> <source>Change Si&ze...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="446"/> + <location filename="../IconEditor/IconEditorWindow.py" line="451"/> <source>Change the icon size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="447"/> + <location filename="../IconEditor/IconEditorWindow.py" line="452"/> <source><b>Change Size...</b><p>Changes the icon size.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="454"/> + <location filename="../IconEditor/IconEditorWindow.py" line="459"/> <source>Grayscale</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="454"/> + <location filename="../IconEditor/IconEditorWindow.py" line="459"/> <source>&Grayscale</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="460"/> + <location filename="../IconEditor/IconEditorWindow.py" line="465"/> <source>Change the icon to grayscale</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="462"/> + <location filename="../IconEditor/IconEditorWindow.py" line="467"/> <source><b>Grayscale</b><p>Changes the icon to grayscale.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Zoom in</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Zoom &in</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Ctrl++</source> <comment>View|Zoom in</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="497"/> + <location filename="../IconEditor/IconEditorWindow.py" line="502"/> <source>Zoom in on the icon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="498"/> + <location filename="../IconEditor/IconEditorWindow.py" line="503"/> <source><b>Zoom in</b><p>Zoom in on the icon. This makes the grid bigger.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Zoom out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Zoom &out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Ctrl+-</source> <comment>View|Zoom out</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="511"/> + <location filename="../IconEditor/IconEditorWindow.py" line="516"/> <source>Zoom out on the icon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="512"/> + <location filename="../IconEditor/IconEditorWindow.py" line="517"/> <source><b>Zoom out</b><p>Zoom out on the icon. This makes the grid smaller.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Zoom reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Zoom &reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Ctrl+0</source> <comment>View|Zoom reset</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="525"/> + <location filename="../IconEditor/IconEditorWindow.py" line="530"/> <source>Reset the zoom of the icon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="527"/> + <location filename="../IconEditor/IconEditorWindow.py" line="532"/> <source><b>Zoom reset</b><p>Reset the zoom of the icon. This sets the zoom factor to 100%.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="535"/> + <location filename="../IconEditor/IconEditorWindow.py" line="540"/> <source>Show Grid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="535"/> + <location filename="../IconEditor/IconEditorWindow.py" line="540"/> <source>Show &Grid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="541"/> + <location filename="../IconEditor/IconEditorWindow.py" line="546"/> <source>Toggle the display of the grid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="543"/> + <location filename="../IconEditor/IconEditorWindow.py" line="548"/> <source><b>Show Grid</b><p>Toggle the display of the grid.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="562"/> + <location filename="../IconEditor/IconEditorWindow.py" line="567"/> <source>Freehand</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="562"/> + <location filename="../IconEditor/IconEditorWindow.py" line="567"/> <source>&Freehand</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="568"/> + <location filename="../IconEditor/IconEditorWindow.py" line="573"/> <source><b>Free hand</b><p>Draws non linear lines.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="577"/> + <location filename="../IconEditor/IconEditorWindow.py" line="582"/> <source>Color Picker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="577"/> + <location filename="../IconEditor/IconEditorWindow.py" line="582"/> <source>&Color Picker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="583"/> + <location filename="../IconEditor/IconEditorWindow.py" line="588"/> <source><b>Color Picker</b><p>The color of the pixel clicked on will become the current draw color.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="594"/> + <location filename="../IconEditor/IconEditorWindow.py" line="599"/> <source>Rectangle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="594"/> + <location filename="../IconEditor/IconEditorWindow.py" line="599"/> <source>&Rectangle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="600"/> + <location filename="../IconEditor/IconEditorWindow.py" line="605"/> <source><b>Rectangle</b><p>Draw a rectangle.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="609"/> + <location filename="../IconEditor/IconEditorWindow.py" line="614"/> <source>Filled Rectangle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="609"/> + <location filename="../IconEditor/IconEditorWindow.py" line="614"/> <source>F&illed Rectangle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="615"/> + <location filename="../IconEditor/IconEditorWindow.py" line="620"/> <source><b>Filled Rectangle</b><p>Draw a filled rectangle.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="625"/> + <location filename="../IconEditor/IconEditorWindow.py" line="630"/> <source>Circle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="631"/> + <location filename="../IconEditor/IconEditorWindow.py" line="636"/> <source><b>Circle</b><p>Draw a circle.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="640"/> + <location filename="../IconEditor/IconEditorWindow.py" line="645"/> <source>Filled Circle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="640"/> + <location filename="../IconEditor/IconEditorWindow.py" line="645"/> <source>Fille&d Circle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="646"/> + <location filename="../IconEditor/IconEditorWindow.py" line="651"/> <source><b>Filled Circle</b><p>Draw a filled circle.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="656"/> + <location filename="../IconEditor/IconEditorWindow.py" line="661"/> <source>Ellipse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="656"/> + <location filename="../IconEditor/IconEditorWindow.py" line="661"/> <source>&Ellipse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="662"/> + <location filename="../IconEditor/IconEditorWindow.py" line="667"/> <source><b>Ellipse</b><p>Draw an ellipse.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="671"/> + <location filename="../IconEditor/IconEditorWindow.py" line="676"/> <source>Filled Ellipse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="671"/> + <location filename="../IconEditor/IconEditorWindow.py" line="676"/> <source>Fille&d Elli&pse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="677"/> + <location filename="../IconEditor/IconEditorWindow.py" line="682"/> <source><b>Filled Ellipse</b><p>Draw a filled ellipse.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="687"/> + <location filename="../IconEditor/IconEditorWindow.py" line="692"/> <source>Flood Fill</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="687"/> + <location filename="../IconEditor/IconEditorWindow.py" line="692"/> <source>Fl&ood Fill</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="693"/> + <location filename="../IconEditor/IconEditorWindow.py" line="698"/> <source><b>Flood Fill</b><p>Fill adjoining pixels with the same color with the current color.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="703"/> + <location filename="../IconEditor/IconEditorWindow.py" line="708"/> <source>Line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="703"/> + <location filename="../IconEditor/IconEditorWindow.py" line="708"/> <source>&Line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="709"/> + <location filename="../IconEditor/IconEditorWindow.py" line="714"/> <source><b>Line</b><p>Draw a line.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="718"/> + <location filename="../IconEditor/IconEditorWindow.py" line="723"/> <source>Eraser (Transparent)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="718"/> + <location filename="../IconEditor/IconEditorWindow.py" line="723"/> <source>Eraser (&Transparent)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="724"/> + <location filename="../IconEditor/IconEditorWindow.py" line="729"/> <source><b>Eraser (Transparent)</b><p>Erase pixels by setting them to transparent.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="733"/> + <location filename="../IconEditor/IconEditorWindow.py" line="738"/> <source>Rectangular Selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="750"/> + <location filename="../IconEditor/IconEditorWindow.py" line="755"/> <source>Rect&angular Selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="739"/> + <location filename="../IconEditor/IconEditorWindow.py" line="744"/> <source><b>Rectangular Selection</b><p>Select a rectangular section of the icon using the mouse.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="750"/> + <location filename="../IconEditor/IconEditorWindow.py" line="755"/> <source>Circular Selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="756"/> + <location filename="../IconEditor/IconEditorWindow.py" line="761"/> <source><b>Circular Selection</b><p>Select a circular section of the icon using the mouse.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="773"/> + <location filename="../IconEditor/IconEditorWindow.py" line="778"/> <source>About</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="773"/> + <location filename="../IconEditor/IconEditorWindow.py" line="778"/> <source>&About</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="777"/> + <location filename="../IconEditor/IconEditorWindow.py" line="782"/> <source>Display information about this software</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="779"/> + <location filename="../IconEditor/IconEditorWindow.py" line="784"/> <source><b>About</b><p>Display some information about this software.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="785"/> + <location filename="../IconEditor/IconEditorWindow.py" line="790"/> <source>About Qt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="785"/> + <location filename="../IconEditor/IconEditorWindow.py" line="790"/> <source>About &Qt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="789"/> + <location filename="../IconEditor/IconEditorWindow.py" line="794"/> <source>Display information about the Qt toolkit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="791"/> + <location filename="../IconEditor/IconEditorWindow.py" line="796"/> <source><b>About Qt</b><p>Display some information about the Qt toolkit.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>What's This?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>&What's This?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>Shift+F1</source> <comment>Help|What's This?'</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="804"/> + <location filename="../IconEditor/IconEditorWindow.py" line="809"/> <source>Context sensitive help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="805"/> + <location filename="../IconEditor/IconEditorWindow.py" line="810"/> <source><b>Display context sensitive help</b><p>In What's This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="822"/> + <location filename="../IconEditor/IconEditorWindow.py" line="827"/> <source>&File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="839"/> + <location filename="../IconEditor/IconEditorWindow.py" line="844"/> <source>&Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="855"/> + <location filename="../IconEditor/IconEditorWindow.py" line="860"/> <source>&View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="863"/> + <location filename="../IconEditor/IconEditorWindow.py" line="868"/> <source>&Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="882"/> + <location filename="../IconEditor/IconEditorWindow.py" line="887"/> <source>&Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="892"/> + <location filename="../IconEditor/IconEditorWindow.py" line="897"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="906"/> + <location filename="../IconEditor/IconEditorWindow.py" line="911"/> <source>Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="919"/> - <source>View</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="924"/> + <source>View</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="929"/> <source>Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="942"/> + <location filename="../IconEditor/IconEditorWindow.py" line="947"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="956"/> + <location filename="../IconEditor/IconEditorWindow.py" line="961"/> <source><p>This part of the status bar displays the icon size.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="963"/> + <location filename="../IconEditor/IconEditorWindow.py" line="968"/> <source><p>This part of the status bar displays the cursor position.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1059"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1064"/> <source>Open icon file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1109"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1114"/> <source>Save icon file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1109"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1114"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1238"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1243"/> <source>eric6 Icon Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1145"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1150"/> <source>The file '{0}' does not exist.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1152"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1157"/> <source>Cannot read file '{0}: {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1186"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1191"/> <source>Cannot write file '{0}: {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1198"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1203"/> <source>Icon saved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1213"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1218"/> <source>Untitled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1217"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1222"/> <source>{0}[*] - {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1217"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1222"/> <source>Icon Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1238"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1243"/> <source>The icon image has unsaved changes.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1328"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1333"/> <source>About eric6 Icon Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1328"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1333"/> <source>The eric6 Icon Editor is a simple editor component to perform icon drawing tasks.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="150"/> + <source>WebP Image File (*.webp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="128"/> + <source>Windows Cursor File (*.cur)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="129"/> + <source>DirectDraw-Surface File (*.dds)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="131"/> + <source>Apple Icon File (*.icns)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="133"/> + <source>JPEG2000 File (*.jp2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>IconSizeDialog</name> @@ -31017,6 +31017,189 @@ </message> </context> <context> + <name>ImageMarkupDialog</name> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="53"/> + <source>Windows Bitmap File (*.bmp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="54"/> + <source>Windows Cursor File (*.cur)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="55"/> + <source>DirectDraw-Surface File (*.dds)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="56"/> + <source>Graphic Interchange Format File (*.gif)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="57"/> + <source>Apple Icon File (*.icns)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="58"/> + <source>Windows Icon File (*.ico)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="59"/> + <source>JPEG2000 File (*.jp2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="60"/> + <source>JPEG File (*.jpg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="61"/> + <source>JPEG File (*.jpeg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="62"/> + <source>Multiple-Image Network Graphics File (*.mng)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="63"/> + <source>Portable Bitmap File (*.pbm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="64"/> + <source>Paintbrush Bitmap File (*.pcx)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="65"/> + <source>Portable Graymap File (*.pgm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="66"/> + <source>Portable Network Graphics File (*.png)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="67"/> + <source>Portable Pixmap File (*.ppm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="68"/> + <source>Silicon Graphics Image File (*.sgi)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="69"/> + <source>Scalable Vector Graphics File (*.svg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="70"/> + <source>Compressed Scalable Vector Graphics File (*.svgz)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="72"/> + <source>Targa Graphic File (*.tga)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="73"/> + <source>TIFF File (*.tif)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="74"/> + <source>TIFF File (*.tiff)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="75"/> + <source>WAP Bitmap File (*.wbmp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="76"/> + <source>WebP Image File (*.webp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="77"/> + <source>X11 Bitmap File (*.xbm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="78"/> + <source>X11 Pixmap File (*.xpm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="89"/> + <source>All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="14"/> + <source>Add Image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="25"/> + <source>Image Address:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="41"/> + <source>Enter the image path or URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="48"/> + <source>Title:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="58"/> + <source>Alternative Text:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="73"/> + <source>Keep Original Size</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="80"/> + <source>Keep Aspect Ratio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="89"/> + <source>Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="119"/> + <source> px</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="109"/> + <source>Height:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ImagesIcon</name> <message> <location filename="../WebBrowser/StatusBar/ImagesIcon.py" line="40"/> @@ -33874,7 +34057,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/LexerAssociationDialog.py" line="131"/> + <location filename="../Project/LexerAssociationDialog.py" line="134"/> <source>Alternative</source> <translation type="unfinished"></translation> </message> @@ -34140,12 +34323,12 @@ <context> <name>Lexers</name> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="365"/> + <location filename="../QScintilla/Lexers/__init__.py" line="375"/> <source>Python Files (*.py *.py2 *.py3)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="538"/> + <location filename="../QScintilla/Lexers/__init__.py" line="556"/> <source>Python3 Files (*.py)</source> <translation type="unfinished"></translation> </message> @@ -34230,480 +34413,500 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="115"/> + <location filename="../QScintilla/Lexers/__init__.py" line="119"/> <source>Pascal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="117"/> - <source>Perl</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="119"/> - <source>PostScript</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="121"/> - <source>Povray</source> + <source>Perl</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="123"/> - <source>Properties</source> + <source>PostScript</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="125"/> - <source>Python2</source> + <source>Povray</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="127"/> - <source>Python3</source> + <source>Properties</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="129"/> - <source>QSS</source> + <source>Python2</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="131"/> - <source>Ruby</source> + <source>Python3</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="133"/> - <source>SQL</source> + <source>QSS</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="135"/> - <source>TCL</source> + <source>Ruby</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="137"/> - <source>TeX</source> + <source>SQL</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="139"/> - <source>VHDL</source> + <source>TCL</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="141"/> - <source>XML</source> + <source>TeX</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="143"/> + <source>VHDL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="145"/> + <source>XML</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="147"/> <source>YAML</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="148"/> + <location filename="../QScintilla/Lexers/__init__.py" line="115"/> <source>Matlab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="148"/> + <location filename="../QScintilla/Lexers/__init__.py" line="117"/> <source>Octave</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="157"/> + <location filename="../QScintilla/Lexers/__init__.py" line="153"/> <source>Gettext</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="162"/> + <location filename="../QScintilla/Lexers/__init__.py" line="158"/> <source>CoffeeScript</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="171"/> + <location filename="../QScintilla/Lexers/__init__.py" line="175"/> <source>Pygments</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="368"/> + <location filename="../QScintilla/Lexers/__init__.py" line="378"/> <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="547"/> + <location filename="../QScintilla/Lexers/__init__.py" line="565"/> <source>Pyrex Files (*.pyx)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="550"/> + <location filename="../QScintilla/Lexers/__init__.py" line="568"/> <source>Quixote Template Files (*.ptl)</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../QScintilla/Lexers/__init__.py" line="571"/> + <source>Ruby Files (*.rb)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="574"/> + <source>IDL Files (*.idl)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="393"/> + <source>C Files (*.h *.c)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="396"/> + <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="586"/> + <source>C# Files (*.cs)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="402"/> + <source>HTML Files (*.html *.htm *.asp *.shtml)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="598"/> + <source>CSS Files (*.css)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="601"/> + <source>QSS Files (*.qss)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="411"/> + <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="414"/> + <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="613"/> + <source>Qt Resource Files (*.qrc)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="420"/> + <source>D Files (*.d *.di)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="622"/> + <source>Java Files (*.java)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="625"/> + <source>JavaScript Files (*.js)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="628"/> + <source>SQL Files (*.sql)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="631"/> + <source>Docbook Files (*.docbook)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="435"/> + <source>Perl Files (*.pl *.pm *.ph)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="640"/> + <source>Lua Files (*.lua)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="441"/> + <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="643"/> + <source>Shell Files (*.sh)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="447"/> + <source>Batch Files (*.bat *.cmd)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> + <source>Diff Files (*.diff *.patch)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="453"/> + <source>Makefiles (*.mak)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="456"/> + <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="667"/> + <source>Povray Files (*.pov)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="463"/> + <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="466"/> + <source>VHDL Files (*.vhd *.vhdl)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="469"/> + <source>TCL/Tk Files (*.tcl *.tk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="472"/> + <source>Fortran Files (*.f90 *.f95 *.f2k)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="475"/> + <source>Fortran77 Files (*.f *.for)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="478"/> + <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="694"/> + <source>PostScript Files (*.ps)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="484"/> + <source>YAML Files (*.yaml *.yml)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="487"/> + <source>Matlab Files (*.m *.m.matlab)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="490"/> + <source>Octave Files (*.m *.m.octave)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="709"/> + <source>Gettext Files (*.po)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="716"/> + <source>CoffeeScript Files (*.coffee)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="744"/> + <source>All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../QScintilla/Lexers/__init__.py" line="553"/> - <source>Ruby Files (*.rb)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="556"/> - <source>IDL Files (*.idl)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="383"/> - <source>C Files (*.h *.c)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="386"/> - <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="568"/> - <source>C# Files (*.cs)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="392"/> - <source>HTML Files (*.html *.htm *.asp *.shtml)</source> + <source>Python2 Files (*.py2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="559"/> + <source>Python2 GUI Files (*.pyw2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="562"/> + <source>Python3 GUI Files (*.pyw)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="577"/> + <source>C Files (*.c)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="580"/> - <source>CSS Files (*.css)</source> + <source>C++ Files (*.cpp)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="583"/> - <source>QSS Files (*.qss)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="401"/> - <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="404"/> - <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> + <source>C++/C Header Files (*.h)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="589"/> + <source>HTML Files (*.html)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="592"/> + <source>PHP Files (*.php)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="595"/> - <source>Qt Resource Files (*.qrc)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="410"/> - <source>D Files (*.d *.di)</source> + <source>ASP Files (*.asp)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="604"/> - <source>Java Files (*.java)</source> + <source>XML Files (*.xml)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="607"/> - <source>JavaScript Files (*.js)</source> + <source>XSL Files (*.xsl)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="610"/> - <source>SQL Files (*.sql)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="613"/> - <source>Docbook Files (*.docbook)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="425"/> - <source>Perl Files (*.pl *.pm *.ph)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="622"/> - <source>Lua Files (*.lua)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="431"/> - <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="625"/> - <source>Shell Files (*.sh)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="437"/> - <source>Batch Files (*.bat *.cmd)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="440"/> - <source>Diff Files (*.diff *.patch)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="443"/> - <source>Makefiles (*.mak)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="446"/> - <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> + <source>DTD Files (*.dtd)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="616"/> + <source>D Files (*.d)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="619"/> + <source>D Interface Files (*.di)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="634"/> + <source>Perl Files (*.pl)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="637"/> + <source>Perl Module Files (*.pm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="646"/> + <source>Batch Files (*.bat)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="649"/> - <source>Povray Files (*.pov)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="453"/> - <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="456"/> - <source>VHDL Files (*.vhd *.vhdl)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="459"/> - <source>TCL/Tk Files (*.tcl *.tk)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="462"/> - <source>Fortran Files (*.f90 *.f95 *.f2k)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="465"/> - <source>Fortran77 Files (*.f *.for)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="468"/> - <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> + <source>TeX Files (*.tex)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="652"/> + <source>TeX Template Files (*.sty)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="655"/> + <source>Diff Files (*.diff)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="658"/> + <source>Make Files (*.mak)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="661"/> + <source>Properties Files (*.ini)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="664"/> + <source>Configuration Files (*.cfg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="670"/> + <source>CMake Files (CMakeLists.txt)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="673"/> + <source>CMake Macro Files (*.cmake)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="676"/> - <source>PostScript Files (*.ps)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="474"/> - <source>YAML Files (*.yaml *.yml)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="480"/> - <source>Matlab Files (*.m *.m.matlab)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="480"/> - <source>Octave Files (*.m *.m.octave)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="695"/> - <source>Gettext Files (*.po)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="702"/> - <source>CoffeeScript Files (*.coffee)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="718"/> - <source>All Files (*)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="535"/> - <source>Python2 Files (*.py2)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="541"/> - <source>Python2 GUI Files (*.pyw2)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="544"/> - <source>Python3 GUI Files (*.pyw)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="559"/> - <source>C Files (*.c)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="562"/> - <source>C++ Files (*.cpp)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="565"/> - <source>C++/C Header Files (*.h)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="571"/> - <source>HTML Files (*.html)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="574"/> - <source>PHP Files (*.php)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="577"/> - <source>ASP Files (*.asp)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="586"/> - <source>XML Files (*.xml)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="589"/> - <source>XSL Files (*.xsl)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="592"/> - <source>DTD Files (*.dtd)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="598"/> - <source>D Files (*.d)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="601"/> - <source>D Interface Files (*.di)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="616"/> - <source>Perl Files (*.pl)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="619"/> - <source>Perl Module Files (*.pm)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="628"/> - <source>Batch Files (*.bat)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="631"/> - <source>TeX Files (*.tex)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="634"/> - <source>TeX Template Files (*.sty)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="637"/> - <source>Diff Files (*.diff)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="640"/> - <source>Make Files (*.mak)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="643"/> - <source>Properties Files (*.ini)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="646"/> - <source>Configuration Files (*.cfg)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="652"/> - <source>CMake Files (CMakeLists.txt)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="655"/> - <source>CMake Macro Files (*.cmake)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="658"/> <source>VHDL Files (*.vhd)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="661"/> - <source>TCL Files (*.tcl)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="664"/> - <source>Tk Files (*.tk)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="667"/> - <source>Fortran Files (*.f95)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="670"/> - <source>Fortran77 Files (*.f)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="673"/> - <source>Pascal Files (*.pas)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="679"/> - <source>YAML Files (*.yml)</source> + <source>TCL Files (*.tcl)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="682"/> + <source>Tk Files (*.tk)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="685"/> + <source>Fortran Files (*.f95)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="688"/> + <source>Fortran77 Files (*.f)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="691"/> + <source>Pascal Files (*.pas)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="697"/> + <source>YAML Files (*.yml)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="700"/> <source>Matlab Files (*.m)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="685"/> + <location filename="../QScintilla/Lexers/__init__.py" line="703"/> <source>Octave Files (*.m.octave)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="163"/> + <source>JSON</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="723"/> + <source>JSON Files (*.json)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="166"/> + <source>Markdown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="728"/> + <source>Markdown Files (*.md)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>LfConvertDataDialog</name> @@ -34916,6 +35119,19 @@ </message> </context> <context> + <name>MarkdownProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/MarkdownProvider.py" line="383"/> + <source>Create List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/MarkdownProvider.py" line="383"/> + <source>Enter desired number of list elements:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>MasterPasswordEntryDialog</name> <message> <location filename="../Preferences/ConfigurationPages/MasterPasswordEntryDialog.ui" line="14"/> @@ -34991,12 +35207,12 @@ <context> <name>McCabeChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="423"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="426"/> <source>'{0}' is too complex ({1})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="425"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="428"/> <source>{0}: {1}</source> <translation type="unfinished"></translation> </message> @@ -35054,137 +35270,132 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="155"/> <source>Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="161"/> <source>No. of commit messages to remember:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="168"/> <source>Enter the number of commit messages to remember</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="216"/> - <source>Incoming / Outgoing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="222"/> - <source>Select to show the incoming and outgoing log in a log browser dialog</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="225"/> - <source>Use Log Browser for incoming / outgoing log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="235"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="242"/> + <source>Select to update the working directory to new tip</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="236"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="241"/> - <source>Select to update the working directory to new tip</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="245"/> <source>Update after pulling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="252"/> <source>Select to prefer unbundle over pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="255"/> <source><b>Prefer Unbundle</b> <p>If this option is selected, it will be checked, if a Mercurial changegroups file from a previous "Show Incoming" request exists. In this case it will be applied and deleted. Otherwise a pull request will be sent.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="259"/> <source>Prefer Unbundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="269"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="275"/> <source>Select to enforce usage of the Mercural internal merge tool</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="278"/> <source><b>Internal Merge Tool</b> <p>Select to enforce usage of the Mercural internal merge tool,which leaves conflict markers in the file in case of conflicting changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="282"/> <source>Use internal merge with conflict markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="292"/> <source>Revert</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="298"/> <source>Select to create a backup file (.orig) before reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="301"/> <source>Create Backup Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="311"/> <source>Cleanup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="317"/> <source>Pattern:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="324"/> <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="334"/> <source>Edit the Mercurial configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="337"/> <source>Edit configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="197"/> <source>No. of commit authors to remember:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="204"/> <source>Enter the number of commit authors to remember</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="132"/> + <source>No. of message characters shown in list:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="139"/> + <source>Enter the number of characters of the commit message to be shown in the list</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -36143,107 +36354,107 @@ <context> <name>MiscellaneousChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="429"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="432"/> <source>coding magic comment not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="432"/> - <source>unknown encoding ({0}) found in coding magic comment</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="435"/> - <source>copyright notice not present</source> + <source>unknown encoding ({0}) found in coding magic comment</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="438"/> - <source>copyright notice contains invalid author</source> + <source>copyright notice not present</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="441"/> - <source>blind except: statement</source> + <source>copyright notice contains invalid author</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="444"/> - <source>found {0} formatter</source> + <source>blind except: statement</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="447"/> - <source>format string does contain unindexed parameters</source> + <source>found {0} formatter</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="450"/> - <source>docstring does contain unindexed parameters</source> + <source>format string does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="453"/> - <source>other string does contain unindexed parameters</source> + <source>docstring does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="456"/> - <source>format call uses too large index ({0})</source> + <source>other string does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="459"/> - <source>format call uses missing keyword ({0})</source> + <source>format call uses too large index ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="462"/> - <source>format call uses keyword arguments but no named entries</source> + <source>format call uses missing keyword ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="465"/> - <source>format call uses variable arguments but no numbered entries</source> + <source>format call uses keyword arguments but no named entries</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="468"/> - <source>format call uses implicit and explicit indexes together</source> + <source>format call uses variable arguments but no numbered entries</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="471"/> - <source>format call provides unused index ({0})</source> + <source>format call uses implicit and explicit indexes together</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="474"/> - <source>format call provides unused keyword ({0})</source> + <source>format call provides unused index ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="477"/> - <source>expected these __future__ imports: {0}; but only got: {1}</source> + <source>format call provides unused keyword ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="480"/> - <source>expected these __future__ imports: {0}; but got none</source> + <source>expected these __future__ imports: {0}; but only got: {1}</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="483"/> - <source>print statement found</source> + <source>expected these __future__ imports: {0}; but got none</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="486"/> - <source>one element tuple found</source> + <source>print statement found</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="489"/> + <source>one element tuple found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="492"/> <source>{0}: {1}</source> <translation type="unfinished"></translation> </message> @@ -36636,72 +36847,72 @@ <context> <name>NamingStyleChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="378"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> <source>class names should use CapWords convention</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> - <source>function name should be lowercase</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="384"/> - <source>argument name should be lowercase</source> + <source>function name should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="387"/> - <source>first argument of a class method should be named 'cls'</source> + <source>argument name should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="390"/> - <source>first argument of a method should be named 'self'</source> + <source>first argument of a class method should be named 'cls'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="393"/> + <source>first argument of a method should be named 'self'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="396"/> <source>first argument of a static method should not be named 'self' or 'cls</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="397"/> - <source>module names should be lowercase</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="400"/> - <source>package names should be lowercase</source> + <source>module names should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="403"/> - <source>constant imported as non constant</source> + <source>package names should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="406"/> - <source>lowercase imported as non lowercase</source> + <source>constant imported as non constant</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="409"/> - <source>camelcase imported as lowercase</source> + <source>lowercase imported as non lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="412"/> - <source>camelcase imported as constant</source> + <source>camelcase imported as lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="415"/> - <source>variable in function should be lowercase</source> + <source>camelcase imported as constant</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="418"/> + <source>variable in function should be lowercase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="421"/> <source>names 'l', 'O' and 'I' should be avoided</source> <translation type="unfinished"></translation> </message> @@ -39073,27 +39284,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1525"/> + <location filename="../Preferences/__init__.py" line="1530"/> <source>Export Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1553"/> + <location filename="../Preferences/__init__.py" line="1558"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1553"/> + <location filename="../Preferences/__init__.py" line="1558"/> <source>Import Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1655"/> + <location filename="../Preferences/__init__.py" line="1660"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1655"/> + <location filename="../Preferences/__init__.py" line="1660"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -39124,13 +39335,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="572"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="565"/> <source><p>ReStructuredText preview requires the <b>python-docutils</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pypi.python.org/pypi/docutils">this page.</a></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="597"/> - <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> + <location filename="../UI/Previewers/PreviewerHTML.py" line="590"/> + <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> <translation type="unfinished"></translation> </message> </context> @@ -39157,17 +39368,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="177"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="179"/> <source><p>No preview available for this type of file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="225"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="230"/> <source>Preview - {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="227"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="232"/> <source>Preview</source> <translation type="unfinished"></translation> </message> @@ -43658,521 +43869,501 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/> - <source>Show log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/> - <source>Show &log</source> + <source>Show log browser</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> - <source>Show the log of the local project</source> + <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="107"/> - <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="114"/> - <source>Show log browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="119"/> - <source>Show a dialog to browse the log of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/> <source>Show &difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="132"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="137"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="140"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/> <source>Show differences (URLs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="153"/> <source>Show the difference of the project between two repository URLs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="156"/> <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/> + <source>Show status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/> + <source>Show &status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> + <source>Show the status of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="172"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> - <source>Show status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> - <source>Show &status</source> + <source>Show change lists</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/> - <source>Show the status of the local project</source> + <source>Show the change lists and associated files of the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="187"/> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> - <source>Show change lists</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="199"/> - <source>Show the change lists and associated files of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="202"/> <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> <source>Show repository info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="215"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="200"/> <source>Show some repository related information for the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="203"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source>Tag in repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source>&Tag in repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="216"/> + <source>Tag the local project in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> - <source>Tag in repository</source> + <source>Export from repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> - <source>&Tag in repository...</source> + <source>&Export from repository...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="231"/> - <source>Tag the local project in the repository</source> + <source>Export a project from the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> - <source>Export from repository</source> + <source>Command options</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> - <source>&Export from repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="246"/> - <source>Export a project from the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/> - <source>Command options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/> <source>Command &options...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Show the VCS command options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/> + <source>Re&vert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <source>Revert all changes made to the local project</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/> - <source>Revert changes</source> + <source>Merge</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/> - <source>Re&vert changes</source> + <source>Mer&ge changes...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> - <source>Revert all changes made to the local project</source> + <source>Merge changes of a tag/revision into the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/> - <source>Merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/> - <source>Mer&ge changes...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="289"/> - <source>Merge changes of a tag/revision into the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/> + <source>S&witch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <source>Switch the local copy to another tag/branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>Switch</source> + <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>S&witch...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> - <source>Switch the local copy to another tag/branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> - <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="304"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="307"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> - <source>Conflicts resolved</source> + <source>Cleanup</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> - <source>Con&flicts resolved</source> + <source>Cleanu&p</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> - <source>Mark all conflicts of the local project as resolved</source> + <source>Cleanup the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="322"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/> - <source>Cleanup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/> - <source>Cleanu&p</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> - <source>Cleanup the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="337"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>Execute command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>E&xecute command...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="333"/> <source>Execute an arbitrary VCS command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="336"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/> <source>List tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/> <source>List tags...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="350"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="361"/> <source>List branches of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="364"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source>List repository contents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source>List repository contents...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="375"/> <source>Lists the contents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/> <source>Set Property</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/> <source>Set Property...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="389"/> <source>Set a property for the project files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="392"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source>List Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source>List Properties...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="403"/> <source>List properties of the project files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/> <source>Delete Property</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/> <source>Delete Property...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> + <source>Delete a property for the project files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="420"/> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/> + <source>Relocate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/> + <source>Relocate...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> - <source>Delete a property for the project files</source> + <source>Relocate the working copy to a new repository URL</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/> - <source>Relocate</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/> - <source>Relocate...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> - <source>Relocate the working copy to a new repository URL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/> + <source>Repository Browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/> + <source>Repository Browser...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> + <source>Show the Repository Browser dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> - <source>Repository Browser</source> + <source>Configure</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> - <source>Repository Browser...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="463"/> - <source>Show the Repository Browser dialog</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="466"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <source>Configure...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="462"/> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="465"/> + <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/> - <source>Configure</source> + <source>Upgrade</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/> - <source>Configure...</source> + <source>Upgrade...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="477"/> - <source>Show the configuration dialog with the Subversion page selected</source> + <source>Upgrade the working copy to the current format</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="480"/> - <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/> - <source>Upgrade</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/> - <source>Upgrade...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="492"/> - <source>Upgrade the working copy to the current format</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="495"/> <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="559"/> <source>Subversion (pysvn)</source> <translation type="unfinished"></translation> </message> @@ -47156,17 +47347,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="55"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="65"/> <source>Press to remove the selected documents from the database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="58"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="68"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="117"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="132"/> <source>Add Documentation</source> <translation type="unfinished"></translation> </message> @@ -47176,40 +47367,50 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="107"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="122"/> <source>The file <b>{0}</b> is not a valid Qt Help File.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="117"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="132"/> <source>The namespace <b>{0}</b> is already registered.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="167"/> + <source>Remove Documentation</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="152"/> - <source>Remove Documentation</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="137"/> <source>Do you really want to remove the selected documentation sets from the database?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="152"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="167"/> <source>Some documents currently opened reference the documentation you are attempting to remove. Removing the documentation will close those documents. Remove anyway?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="78"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="55"/> <source>Press to select QtHelp documents provided by a plug-in to add to the database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="81"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="58"/> <source>Add from Plug-ins...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="85"/> + <source>Select to manage the plug-in provided documentation sets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="88"/> + <source>Manage Plug-ins...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QtHelpDocumentationSelectionDialog</name> @@ -47223,6 +47424,61 @@ <source>Select the documentation files to be installed:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="144"/> + <source>Delete Documentation Sets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="91"/> + <source>Shall the selected documentation sets really be deleted?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="107"/> + <source><p>The documentation set <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="126"/> + <source>Shall the selected documentation set categories really be deleted?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="144"/> + <source>Shall all documentation sets really be deleted?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="56"/> + <source>Press to delete the selected documentation sets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="59"/> + <source>Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="66"/> + <source>Press to delete the selected category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="69"/> + <source>Delete Categories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="76"/> + <source>Press to delete all entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="79"/> + <source>Delete All</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QtHelpFiltersDialog</name> @@ -48490,6 +48746,19 @@ </message> </context> <context> + <name>RestructuredTextProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/RestructuredTextProvider.py" line="411"/> + <source>Create List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/RestructuredTextProvider.py" line="411"/> + <source>Enter desired number of list elements:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>SafariImporter</name> <message> <location filename="../WebBrowser/Bookmarks/BookmarksImporters/SafariImporter.py" line="44"/> @@ -51754,188 +52023,178 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> - <source>Subversion Log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> - <source>Select number of entries to show.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/> <source>Subversion Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="951"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="998"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="978"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1033"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1013"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1255"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1234"/> <source>Revision {0}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1042"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1056"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1093"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1073"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1151"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1131"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1196"/> <source>Merging {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1482"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1462"/> <source>Cleaning up {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1512"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1492"/> <source>Subversion command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1684"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1664"/> <source>Resolving conficts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1695"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1779"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1759"/> <source>Subversion Set Property</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1781"/> + <source>You have to supply a property name. Aborting.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1923"/> + <source>Property set.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1801"/> - <source>You have to supply a property name. Aborting.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1944"/> - <source>Property set.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1821"/> <source>Subversion Delete Property</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1997"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1976"/> <source>Property deleted.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/> <source>Subversion Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/> <source>Subversion Lock</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/> <source>Enter lock comment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2080"/> <source>Locking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2108"/> <source>Unlocking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2153"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2133"/> <source>Relocating</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/> <source>Repository Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/> <source>Enter the repository URL.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2221"/> <source>Remove from changelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/> <source>Add to changelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/> <source>Enter name of the changelist:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2305"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2285"/> <source>Upgrade</source> <translation type="unfinished"></translation> </message> @@ -51945,7 +52204,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1984"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1964"/> <source>The svn process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -51955,12 +52214,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1791"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1771"/> <source>Enter property name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1987"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1967"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -52816,17 +53075,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="661"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="658"/> <source>Author</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="165"/> <source>Message</source> <translation type="unfinished"></translation> </message> @@ -52886,253 +53145,128 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="261"/> <source>Press to generate a diff to the previous revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="264"/> <source>&Diff to Previous</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="271"/> <source>Press to compare two revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="254"/> - <source>&Compare Revisions</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> + <source>&Compare Revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="294"/> <source>Select to show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="297"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="312"/> <source>Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="318"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="334"/> <source>Input</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="336"/> - <source>Press to send the input to the subversion process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="349"/> - <source>Enter data to be sent to the subversion process</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> - <source>Select to switch the input field to password mode</source> + <source>Press to send the input to the subversion process</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> - <source>&Password Mode</source> + <source>&Send</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="369"/> + <source>Enter data to be sent to the subversion process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="376"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="379"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="382"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="89"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="93"/> <source>Added</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="90"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="94"/> <source>Deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="91"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="95"/> <source>Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="96"/> <source>Replaced</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="504"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="527"/> <source>Subversion Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="313"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="313"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>SvnLogDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="14"/> - <source>Subversion Log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="26"/> - <source>Log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="32"/> - <source><b>Subversion Log</b><p>This shows the output of the svn log command. By clicking on the links you may show the difference between versions.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="42"/> - <source>Select to show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="45"/> - <source>Show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="58"/> - <source>Errors</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="64"/> - <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="80"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="102"/> - <source>Press to send the input to the subversion process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="105"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="108"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="115"/> - <source>Enter data to be sent to the subversion process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="122"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="125"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="128"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="55"/> - <source><b>Processing your request, please wait...</b></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="81"/> - <source>Added</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="82"/> - <source>Deleted</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="83"/> - <source>Modified</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="87"/> - <source>revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="193"/> - <source>diff to {0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="202"/> - <source><i>author: {0}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="205"/> - <source><i>date: {0}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="191"/> - <source> (copied from {0}, revision {1})</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <source>Press to move down in the log list</source> <translation type="unfinished"></translation> </message> </context> @@ -53414,177 +53548,172 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="634"/> <source>Version Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="654"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="646"/> <source>Update from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="658"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="650"/> <source>Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="656"/> <source>Add to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="385"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="381"/> <source>Add tree to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="660"/> <source>Remove from repository (and disk)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="547"/> <source>Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="549"/> <source>Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="667"/> <source>Add to Changelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="679"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="671"/> <source>Remove from Changelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="566"/> - <source>Show log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="562"/> <source>Show log browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="684"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="676"/> <source>Show status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="572"/> <source>Show repository info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="681"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="271"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="267"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="693"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="685"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="276"/> <source>Show differences side-by-side (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="698"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="690"/> <source>Show differences (URLs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="286"/> <source>Show annotated file</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="696"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="700"/> + <source>Merge changes</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/> - <source>Revert changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="708"/> - <source>Merge changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="712"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="430"/> + <source>Lock</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="434"/> - <source>Lock</source> + <source>Unlock</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="438"/> - <source>Unlock</source> + <source>Break Lock</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="442"/> - <source>Break Lock</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="446"/> <source>Steal Lock</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="708"/> + <source>Set Property</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="710"/> + <source>List Properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="713"/> + <source>Delete Property</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="716"/> - <source>Set Property</source> + <source>Select all local file entries</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="718"/> - <source>List Properties</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="721"/> - <source>Delete Property</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="724"/> - <source>Select all local file entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="726"/> <source>Select all versioned file entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="720"/> <source>Select all local directory entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="730"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="722"/> <source>Select all versioned directory entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="733"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="725"/> <source>Configure...</source> <translation type="unfinished"></translation> </message> @@ -53653,506 +53782,486 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/> - <source>Show log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/> - <source>Show &log</source> + <source>Show log browser</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="104"/> - <source>Show the log of the local project</source> + <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="107"/> - <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="114"/> - <source>Show log browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="119"/> - <source>Show a dialog to browse the log of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="122"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/> <source>Show &difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="121"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="124"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="132"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="137"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="140"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="148"/> <source>Show differences (URLs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="153"/> <source>Show the difference of the project between two repository URLs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="156"/> <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="164"/> + <source>Show status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="164"/> + <source>Show &status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="169"/> + <source>Show the status of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="172"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> - <source>Show status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> - <source>Show &status</source> + <source>Show change lists</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="184"/> - <source>Show the status of the local project</source> + <source>Show the change lists and associated files of the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="187"/> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="194"/> - <source>Show change lists</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="199"/> - <source>Show the change lists and associated files of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="202"/> <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="195"/> + <source>Tag in repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="195"/> + <source>&Tag in repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="200"/> + <source>Tag the local project in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="203"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="210"/> - <source>Tag in repository</source> + <source>Export from repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="210"/> - <source>&Tag in repository...</source> + <source>&Export from repository...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="215"/> - <source>Tag the local project in the repository</source> + <source>Export a project from the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="218"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/> - <source>Export from repository</source> + <source>Command options</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/> - <source>&Export from repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="230"/> - <source>Export a project from the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="233"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="240"/> - <source>Command options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="240"/> <source>Command &options...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="229"/> <source>Show the VCS command options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="231"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="238"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="238"/> + <source>Re&vert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="243"/> + <source>Revert all changes made to the local project</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="246"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/> - <source>Revert changes</source> + <source>Merge</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/> - <source>Re&vert changes</source> + <source>Mer&ge changes...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="258"/> - <source>Revert all changes made to the local project</source> + <source>Merge changes of a tag/revision into the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="261"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="268"/> - <source>Merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="268"/> - <source>Mer&ge changes...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="273"/> - <source>Merge changes of a tag/revision into the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="276"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="269"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="269"/> + <source>S&witch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="274"/> + <source>Switch the local copy to another tag/branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="277"/> + <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> - <source>Switch</source> + <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> - <source>S&witch...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="289"/> - <source>Switch the local copy to another tag/branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="292"/> - <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="288"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="291"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> - <source>Conflicts resolved</source> + <source>Cleanup</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> - <source>Con&flicts resolved</source> + <source>Cleanu&p</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="303"/> - <source>Mark all conflicts of the local project as resolved</source> + <source>Cleanup the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="306"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="314"/> - <source>Cleanup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="314"/> - <source>Cleanu&p</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="318"/> - <source>Cleanup the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="321"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="328"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="313"/> <source>Execute command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="328"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="313"/> <source>E&xecute command...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="317"/> <source>Execute an arbitrary VCS command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="320"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="327"/> <source>List tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="327"/> <source>List tags...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="331"/> <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="334"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="341"/> <source>List branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="341"/> <source>List branches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="345"/> <source>List branches of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="348"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="355"/> <source>List repository contents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="355"/> <source>List repository contents...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="374"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="359"/> <source>Lists the contents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="377"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="362"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="369"/> <source>Set Property</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="369"/> <source>Set Property...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="373"/> <source>Set a property for the project files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="376"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="383"/> <source>List Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="383"/> <source>List Properties...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="387"/> <source>List properties of the project files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="390"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="397"/> <source>Delete Property</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="397"/> <source>Delete Property...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="401"/> + <source>Delete a property for the project files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="404"/> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/> + <source>Relocate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/> + <source>Relocate...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="416"/> - <source>Delete a property for the project files</source> + <source>Relocate the working copy to a new repository URL</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="419"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="426"/> - <source>Relocate</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="426"/> - <source>Relocate...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="431"/> - <source>Relocate the working copy to a new repository URL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="434"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="427"/> + <source>Repository Browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="427"/> + <source>Repository Browser...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="432"/> + <source>Show the Repository Browser dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="435"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> - <source>Repository Browser</source> + <source>Configure</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> - <source>Repository Browser...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="447"/> - <source>Show the Repository Browser dialog</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="450"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <source>Configure...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="446"/> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="449"/> + <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> - <source>Configure</source> + <source>Upgrade</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> - <source>Configure...</source> + <source>Upgrade...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="461"/> - <source>Show the configuration dialog with the Subversion page selected</source> + <source>Upgrade the working copy to the current format</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="464"/> - <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="472"/> - <source>Upgrade</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="472"/> - <source>Upgrade...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="476"/> - <source>Upgrade the working copy to the current format</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="479"/> <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="559"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="543"/> <source>Subversion (svn)</source> <translation type="unfinished"></translation> </message> @@ -58403,22 +58512,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="66"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="62"/> <source>Language:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="70"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="69"/> <source>GROUP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="103"/> <source>Close dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="103"/> <source>Do you really want to close the dialog?</source> <translation type="unfinished"></translation> </message> @@ -60033,7 +60142,7 @@ <context> <name>UnittestDialog</name> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.py" line="403"/> <source>Unittest</source> <translation type="unfinished"></translation> </message> @@ -60279,72 +60388,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="202"/> + <location filename="../PyUnit/UnittestDialog.py" line="205"/> <source>Python3 Files ({1});;Python2 Files ({0});;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="206"/> + <location filename="../PyUnit/UnittestDialog.py" line="209"/> <source>Python Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="266"/> + <location filename="../PyUnit/UnittestDialog.py" line="269"/> <source>You must enter a test suite file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="274"/> + <location filename="../PyUnit/UnittestDialog.py" line="277"/> <source>Preparing Testsuite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.py" line="403"/> <source><p>Unable to run test <b>{0}</b>.<br>{1}<br>{2}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="469"/> + <location filename="../PyUnit/UnittestDialog.py" line="475"/> <source>Running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="493"/> + <location filename="../PyUnit/UnittestDialog.py" line="499"/> <source>Ran {0} test in {1:.3f}s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="497"/> + <location filename="../PyUnit/UnittestDialog.py" line="503"/> <source>Ran {0} tests in {1:.3f}s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="514"/> + <location filename="../PyUnit/UnittestDialog.py" line="520"/> <source>Failure: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="529"/> + <location filename="../PyUnit/UnittestDialog.py" line="535"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="544"/> + <location filename="../PyUnit/UnittestDialog.py" line="550"/> <source> Skipped: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="559"/> + <location filename="../PyUnit/UnittestDialog.py" line="565"/> <source> Expected Failure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="573"/> + <location filename="../PyUnit/UnittestDialog.py" line="579"/> <source> Unexpected Success</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="634"/> + <location filename="../PyUnit/UnittestDialog.py" line="640"/> <source>Show Source</source> <translation type="unfinished"></translation> </message> @@ -62682,7 +62791,7 @@ <context> <name>Utilities</name> <message> - <location filename="../Utilities/__init__.py" line="1400"/> + <location filename="../Utilities/__init__.py" line="1403"/> <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> @@ -62901,12 +63010,12 @@ </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="38"/> - <source>&Locals Filter</source> + <source>&Locals Viewer</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="48"/> - <source>&Globals Filter</source> + <source>&Globals Viewer</source> <translation type="unfinished"></translation> </message> <message> @@ -62917,7 +63026,7 @@ <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="61"/> <source><b>Locals Filter List</b> -<p>Select the variable types you want to be filtered out of the locals variables list.</p<</source> +<p>Select the variable types you want to be shown in the local variables viewer.</p<</source> <translation type="unfinished"></translation> </message> <message> @@ -62928,7 +63037,7 @@ <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="81"/> <source><b>Globals Filter List</b> -<p>Select the variable types you want to be filtered out of the globals variables list.</p<</source> +<p>Select the variable types you want to be shown in the global variables viewer.</p<</source> <translation type="unfinished"></translation> </message> <message> @@ -62936,6 +63045,11 @@ <source>Save Default</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Debugger/VariablesFilterDialog.ui" line="28"/> + <source>Select the variable types to be shown in the variables viewers:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VariablesViewer</name> @@ -63503,7 +63617,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="532"/> + <location filename="../VCS/ProjectHelper.py" line="533"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -63518,7 +63632,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="532"/> + <location filename="../VCS/ProjectHelper.py" line="533"/> <source>Switch</source> <translation type="unfinished"></translation> </message> @@ -63593,17 +63707,17 @@ <context> <name>VersionControl</name> <message> - <location filename="../VCS/VersionControl.py" line="573"/> + <location filename="../VCS/VersionControl.py" line="563"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VCS/VersionControl.py" line="573"/> + <location filename="../VCS/VersionControl.py" line="563"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VCS/VersionControl.py" line="704"/> + <location filename="../VCS/VersionControl.py" line="694"/> <source>Repository status checking is switched off</source> <translation type="unfinished"></translation> </message> @@ -70821,35 +70935,35 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1459"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1426"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1446"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -70860,35 +70974,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2078"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2083"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -71397,50 +71511,55 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="240"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="243"/> <source>do not assign a lambda expression, use a def</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="243"/> - <source>ambiguous variable name '{0}'</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="246"/> - <source>ambiguous class definition '{0}'</source> + <source>ambiguous variable name '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="249"/> - <source>ambiguous function definition '{0}'</source> + <source>ambiguous class definition '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="252"/> - <source>{0}: {1}</source> + <source>ambiguous function definition '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="255"/> + <source>{0}: {1}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="258"/> <source>{0}</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="240"/> + <source>do not use bare except</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>subversion</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1741"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1720"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1746"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1725"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1606"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1586"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation type="unfinished"></translation> </message>
diff -r 852016bbdedb -r c307358a2ecc i18n/eric6_en.ts --- a/i18n/eric6_en.ts Fri Jan 27 19:18:52 2017 +0100 +++ b/i18n/eric6_en.ts Fri Feb 03 19:20:59 2017 +0100 @@ -3480,147 +3480,147 @@ <context> <name>CodeStyleFixer</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="494"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> <source>Triple single quotes converted to triple double quotes.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> - <source>Introductory quotes corrected to be {0}"""</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="500"/> - <source>Single line docstring put on one line.</source> + <source>Introductory quotes corrected to be {0}"""</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="503"/> + <source>Single line docstring put on one line.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="506"/> <source>Period added to summary line.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> <source>Blank line before function/method docstring removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="509"/> - <source>Blank line inserted before class docstring.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="512"/> - <source>Blank line inserted after class docstring.</source> + <source>Blank line inserted before class docstring.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="515"/> - <source>Blank line inserted after docstring summary.</source> + <source>Blank line inserted after class docstring.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="518"/> - <source>Blank line inserted after last paragraph of docstring.</source> + <source>Blank line inserted after docstring summary.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="521"/> - <source>Leading quotes put on separate line.</source> + <source>Blank line inserted after last paragraph of docstring.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="524"/> - <source>Trailing quotes put on separate line.</source> + <source>Leading quotes put on separate line.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="527"/> + <source>Trailing quotes put on separate line.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> <source>Blank line before class docstring removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> - <source>Blank line after class docstring removed.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="536"/> - <source>Blank line after function/method docstring removed.</source> + <source>Blank line after class docstring removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="539"/> - <source>Blank line after last paragraph removed.</source> + <source>Blank line after function/method docstring removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="542"/> - <source>Tab converted to 4 spaces.</source> + <source>Blank line after last paragraph removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="545"/> - <source>Indentation adjusted to be a multiple of four.</source> + <source>Tab converted to 4 spaces.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="548"/> - <source>Indentation of continuation line corrected.</source> + <source>Indentation adjusted to be a multiple of four.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="551"/> - <source>Indentation of closing bracket corrected.</source> + <source>Indentation of continuation line corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="554"/> - <source>Missing indentation of continuation line corrected.</source> + <source>Indentation of closing bracket corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="557"/> - <source>Closing bracket aligned to opening bracket.</source> + <source>Missing indentation of continuation line corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="560"/> - <source>Indentation level changed.</source> + <source>Closing bracket aligned to opening bracket.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="563"/> - <source>Indentation level of hanging indentation changed.</source> + <source>Indentation level changed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="566"/> + <source>Indentation level of hanging indentation changed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="569"/> <source>Visual indentation corrected.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="584"/> + <source>Extraneous whitespace removed.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="581"/> - <source>Extraneous whitespace removed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="578"/> <source>Missing whitespace added.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="584"/> - <source>Whitespace around comment sign corrected.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="587"/> + <source>Whitespace around comment sign corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="590"/> <source>One blank line inserted.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="591"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> <source>%n blank line(s) inserted.</source> <translation> <numerusform>%n blank line inserted.</numerusform> @@ -3628,7 +3628,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="597"/> <source>%n superfluous lines removed</source> <translation> <numerusform>%n superfluous line removed</numerusform> @@ -3636,77 +3636,77 @@ </translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="598"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="601"/> <source>Superfluous blank lines removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="601"/> - <source>Superfluous blank lines after function decorator removed.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="604"/> - <source>Imports were put on separate lines.</source> + <source>Superfluous blank lines after function decorator removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="607"/> - <source>Long lines have been shortened.</source> + <source>Imports were put on separate lines.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="610"/> + <source>Long lines have been shortened.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="613"/> <source>Redundant backslash in brackets removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="616"/> - <source>Compound statement corrected.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="619"/> - <source>Comparison to None/True/False corrected.</source> + <source>Compound statement corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="622"/> - <source>'{0}' argument added.</source> + <source>Comparison to None/True/False corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="625"/> - <source>'{0}' argument removed.</source> + <source>'{0}' argument added.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="628"/> - <source>Whitespace stripped from end of line.</source> + <source>'{0}' argument removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="631"/> - <source>newline added to end of file.</source> + <source>Whitespace stripped from end of line.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="634"/> - <source>Superfluous trailing blank lines removed from end of file.</source> + <source>newline added to end of file.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="637"/> + <source>Superfluous trailing blank lines removed from end of file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="640"/> <source>'<>' replaced by '!='.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="641"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="644"/> <source>Could not save the file! Skipping it. Reason: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="710"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="713"/> <source> no message defined for code '{0}'</source> <translation type="unfinished"></translation> </message> @@ -6949,197 +6949,197 @@ <context> <name>DocStyleChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="260"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="263"/> <source>module is missing a docstring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="262"/> - <source>public function/method is missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="265"/> - <source>private function/method may be missing a docstring</source> + <source>public function/method is missing a docstring</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="268"/> + <source>private function/method may be missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="271"/> <source>public class is missing a docstring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="270"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="273"/> <source>private class may be missing a docstring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="272"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="275"/> <source>docstring not surrounded by """</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="274"/> - <source>docstring containing \ not surrounded by r"""</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="277"/> - <source>docstring containing unicode character not surrounded by u"""</source> + <source>docstring containing \ not surrounded by r"""</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="280"/> + <source>docstring containing unicode character not surrounded by u"""</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="283"/> <source>one-liner docstring on multiple lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="282"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="285"/> <source>docstring has wrong indentation</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="328"/> + <source>docstring summary does not end with a period</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="291"/> + <source>docstring summary is not in imperative mood (Does instead of Do)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="295"/> + <source>docstring summary looks like a function's/method's signature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="298"/> + <source>docstring does not mention the return value type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="301"/> + <source>function/method docstring is separated by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="304"/> + <source>class docstring is not preceded by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="307"/> + <source>class docstring is not followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="362"/> + <source>docstring summary is not followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="313"/> + <source>last paragraph of docstring is not followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="317"/> + <source>private function/method is missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="320"/> + <source>private class is missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="322"/> + <source>leading quotes of docstring not on separate line</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="325"/> - <source>docstring summary does not end with a period</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="288"/> - <source>docstring summary is not in imperative mood (Does instead of Do)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="292"/> - <source>docstring summary looks like a function's/method's signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="295"/> - <source>docstring does not mention the return value type</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="298"/> - <source>function/method docstring is separated by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="301"/> - <source>class docstring is not preceded by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="304"/> - <source>class docstring is not followed by a blank line</source> + <source>trailing quotes of docstring not on separate line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="332"/> + <source>docstring does not contain a @return line but function/method returns something</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="336"/> + <source>docstring contains a @return line but function/method doesn't return anything</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="340"/> + <source>docstring does not contain enough @param/@keyparam lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="343"/> + <source>docstring contains too many @param/@keyparam lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="346"/> + <source>keyword only arguments must be documented with @keyparam lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="349"/> + <source>order of @param/@keyparam lines does not match the function/method signature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="352"/> + <source>class docstring is preceded by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="354"/> + <source>class docstring is followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="356"/> + <source>function/method docstring is preceded by a blank line</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="359"/> - <source>docstring summary is not followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="310"/> - <source>last paragraph of docstring is not followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="314"/> - <source>private function/method is missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="317"/> - <source>private class is missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="319"/> - <source>leading quotes of docstring not on separate line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="322"/> - <source>trailing quotes of docstring not on separate line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="329"/> - <source>docstring does not contain a @return line but function/method returns something</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="333"/> - <source>docstring contains a @return line but function/method doesn't return anything</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="337"/> - <source>docstring does not contain enough @param/@keyparam lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="340"/> - <source>docstring contains too many @param/@keyparam lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="343"/> - <source>keyword only arguments must be documented with @keyparam lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="346"/> - <source>order of @param/@keyparam lines does not match the function/method signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="349"/> - <source>class docstring is preceded by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="351"/> - <source>class docstring is followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="353"/> - <source>function/method docstring is preceded by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="356"/> <source>function/method docstring is followed by a blank line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="362"/> - <source>last paragraph of docstring is followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="365"/> + <source>last paragraph of docstring is followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="368"/> <source>docstring does not contain a @exception line but function/method raises an exception</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="369"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="372"/> <source>docstring contains a @exception line but function/method doesn't raise an exception</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="374"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="377"/> <source>{0}: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="284"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="287"/> <source>docstring does not contain a summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="327"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="330"/> <source>docstring summary does not start with '{0}'</source> <translation type="unfinished"></translation> </message> @@ -8909,892 +8909,892 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2878"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source>Open File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="340"/> + <location filename="../QScintilla/Editor.py" line="343"/> <source><p>The size of the file <b>{0}</b> is <b>{1} KB</b>. Do you really want to load it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="400"/> + <location filename="../QScintilla/Editor.py" line="403"/> <source><b>A Source Editor Window</b><p>This window is used to display and edit a source file. You can open as many of these as you like. The name of the file is displayed in the window's titlebar.</p><p>In order to set breakpoints just click in the space between the line numbers and the fold markers. Via the context menu of the margins they may be edited.</p><p>In order to set bookmarks just Shift click in the space between the line numbers and the fold markers.</p><p>These actions can be reversed via the context menu.</p><p>Ctrl clicking on a syntax error marker shows some info about this error.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="658"/> - <source>Undo</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="661"/> - <source>Redo</source> + <source>Undo</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="664"/> + <source>Redo</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="667"/> <source>Revert to last saved state</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="668"/> - <source>Cut</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="671"/> - <source>Copy</source> + <source>Cut</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="674"/> + <source>Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="677"/> <source>Paste</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="679"/> - <source>Indent</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="682"/> - <source>Unindent</source> + <source>Indent</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="685"/> - <source>Comment</source> + <source>Unindent</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="688"/> - <source>Uncomment</source> + <source>Comment</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="691"/> - <source>Stream Comment</source> + <source>Uncomment</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="694"/> + <source>Stream Comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="697"/> <source>Box Comment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="698"/> - <source>Select to brace</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="700"/> - <source>Select all</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="701"/> + <source>Select to brace</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="703"/> + <source>Select all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="704"/> <source>Deselect all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7242"/> + <location filename="../QScintilla/Editor.py" line="7249"/> <source>Check spelling...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="707"/> + <location filename="../QScintilla/Editor.py" line="710"/> <source>Check spelling of selection...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="711"/> + <location filename="../QScintilla/Editor.py" line="714"/> <source>Remove from dictionary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="715"/> + <location filename="../QScintilla/Editor.py" line="718"/> <source>Shorten empty lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="722"/> + <location filename="../QScintilla/Editor.py" line="725"/> <source>Use Monospaced Font</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="727"/> + <location filename="../QScintilla/Editor.py" line="730"/> <source>Autosave enabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="731"/> + <location filename="../QScintilla/Editor.py" line="734"/> <source>Typing aids enabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="768"/> + <location filename="../QScintilla/Editor.py" line="771"/> <source>Close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="774"/> - <source>Save</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="777"/> + <source>Save</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="780"/> <source>Save As...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="790"/> - <source>Print Preview</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="793"/> + <source>Print Preview</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="796"/> <source>Print</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="819"/> + <location filename="../QScintilla/Editor.py" line="822"/> <source>Complete from Document</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="821"/> + <location filename="../QScintilla/Editor.py" line="824"/> <source>Complete from APIs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="823"/> + <location filename="../QScintilla/Editor.py" line="826"/> <source>Complete from Document and APIs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="746"/> + <location filename="../QScintilla/Editor.py" line="749"/> <source>Calltip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="837"/> + <location filename="../QScintilla/Editor.py" line="840"/> <source>Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="857"/> - <source>Show</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="859"/> - <source>Code metrics...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="860"/> - <source>Code coverage...</source> + <source>Show</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="862"/> - <source>Show code coverage annotations</source> + <source>Code metrics...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="863"/> + <source>Code coverage...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="865"/> - <source>Hide code coverage annotations</source> + <source>Show code coverage annotations</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="868"/> + <source>Hide code coverage annotations</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="871"/> <source>Profile data...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="881"/> + <location filename="../QScintilla/Editor.py" line="884"/> <source>Diagrams</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="883"/> + <location filename="../QScintilla/Editor.py" line="886"/> <source>Class Diagram...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="885"/> + <location filename="../QScintilla/Editor.py" line="888"/> <source>Package Diagram...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="887"/> + <location filename="../QScintilla/Editor.py" line="890"/> <source>Imports Diagram...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="889"/> + <location filename="../QScintilla/Editor.py" line="892"/> <source>Application Diagram...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="907"/> - <source>Languages</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="910"/> + <source>Languages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="913"/> <source>No Language</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="933"/> + <location filename="../QScintilla/Editor.py" line="936"/> <source>Guessed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1268"/> + <location filename="../QScintilla/Editor.py" line="1271"/> <source>Alternatives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="953"/> + <location filename="../QScintilla/Editor.py" line="956"/> <source>Encodings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="994"/> + <location filename="../QScintilla/Editor.py" line="997"/> <source>End-of-Line Type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="998"/> + <location filename="../QScintilla/Editor.py" line="1001"/> <source>Unix</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1005"/> + <location filename="../QScintilla/Editor.py" line="1008"/> <source>Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1012"/> + <location filename="../QScintilla/Editor.py" line="1015"/> <source>Macintosh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1030"/> + <location filename="../QScintilla/Editor.py" line="1033"/> <source>Export as</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1153"/> + <location filename="../QScintilla/Editor.py" line="1156"/> <source>Toggle bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1155"/> + <location filename="../QScintilla/Editor.py" line="1158"/> <source>Next bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1157"/> + <location filename="../QScintilla/Editor.py" line="1160"/> <source>Previous bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1159"/> + <location filename="../QScintilla/Editor.py" line="1162"/> <source>Clear all bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1179"/> + <location filename="../QScintilla/Editor.py" line="1182"/> <source>Toggle breakpoint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1181"/> - <source>Toggle temporary breakpoint</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1184"/> + <source>Toggle temporary breakpoint</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1187"/> <source>Edit breakpoint...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5154"/> + <location filename="../QScintilla/Editor.py" line="5161"/> <source>Enable breakpoint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1189"/> + <location filename="../QScintilla/Editor.py" line="1192"/> <source>Next breakpoint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1191"/> + <location filename="../QScintilla/Editor.py" line="1194"/> <source>Previous breakpoint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1193"/> + <location filename="../QScintilla/Editor.py" line="1196"/> <source>Clear all breakpoints</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1162"/> + <location filename="../QScintilla/Editor.py" line="1165"/> <source>Goto syntax error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1164"/> + <location filename="../QScintilla/Editor.py" line="1167"/> <source>Show syntax error message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1166"/> - <source>Clear syntax error</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1169"/> - <source>Next warning</source> + <source>Clear syntax error</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="1172"/> + <source>Next warning</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1175"/> <source>Previous warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1174"/> + <location filename="../QScintilla/Editor.py" line="1177"/> <source>Show warning message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1176"/> + <location filename="../QScintilla/Editor.py" line="1179"/> <source>Clear warnings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1196"/> - <source>Next uncovered line</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1199"/> - <source>Previous uncovered line</source> + <source>Next uncovered line</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="1202"/> + <source>Previous uncovered line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1205"/> <source>Next task</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1204"/> + <location filename="../QScintilla/Editor.py" line="1207"/> <source>Previous task</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../QScintilla/Editor.py" line="1216"/> + <source>LMB toggles bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1220"/> + <source>LMB toggles breakpoints</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1256"/> + <source>Export source</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1248"/> + <source><p>No exporter available for the export format <b>{0}</b>. Aborting...</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1256"/> + <source>No export format given. Aborting...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1267"/> + <source>Alternatives ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1287"/> + <source>Pygments Lexer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1287"/> + <source>Select the Pygments lexer to apply.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1757"/> + <source>Modification of Read Only file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1757"/> + <source>You are attempting to change a read only file. Please save to a different file first.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2448"/> + <source>Printing...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2465"/> + <source>Printing completed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2467"/> + <source>Error while printing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2470"/> + <source>Printing aborted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2828"/> + <source>File Modified</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2828"/> + <source><p>The file <b>{0}</b> has unsaved changes.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2883"/> + <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="3046"/> + <source>Save File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2987"/> + <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="3046"/> + <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="4434"/> + <source>Autocompletion</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="4434"/> + <source>Autocompletion is not available because there is no autocompletion source set.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5164"/> + <source>Disable breakpoint</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5538"/> + <source>Code Coverage</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5538"/> + <source>Please select a coverage file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5601"/> + <source>Show Code Coverage Annotations</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5594"/> + <source>All lines have been covered.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5601"/> + <source>There is no coverage file available.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5716"/> + <source>Profile Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5716"/> + <source>Please select a profile file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5876"/> + <source>Syntax Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5876"/> + <source>No syntax error message available.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6191"/> + <source>Macro Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6191"/> + <source>Select a macro name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6219"/> + <source>Load macro file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6262"/> + <source>Macro files (*.macro)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6242"/> + <source>Error loading macro</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6233"/> + <source><p>The macro file <b>{0}</b> could not be read.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6242"/> + <source><p>The macro file <b>{0}</b> is corrupt.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6262"/> + <source>Save macro file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6279"/> + <source>Save macro</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6279"/> + <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6295"/> + <source>Error saving macro</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6295"/> + <source><p>The macro file <b>{0}</b> could not be written.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6308"/> + <source>Start Macro Recording</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6308"/> + <source>Macro recording is already active. Start new?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6334"/> + <source>Macro Recording</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6334"/> + <source>Enter name of the macro:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6472"/> + <source>File changed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6636"/> + <source>{0} (ro)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6776"/> + <source>Drop Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6776"/> + <source><p><b>{0}</b> is not a file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6797"/> + <source>Resources</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6799"/> + <source>Add file...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6801"/> + <source>Add files...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6803"/> + <source>Add aliased file...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6806"/> + <source>Add localized resource...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6810"/> + <source>Add resource frame</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6829"/> + <source>Add file resource</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6845"/> + <source>Add file resources</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6873"/> + <source>Add aliased file resource</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6873"/> + <source>Alias for file <b>{0}</b>:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6937"/> + <source>Package Diagram</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6937"/> + <source>Include class attributes?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6957"/> + <source>Imports Diagram</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6957"/> + <source>Include imports from external modules?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6971"/> + <source>Application Diagram</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6971"/> + <source>Include module names?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7252"/> + <source>Add to dictionary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7254"/> + <source>Ignore All</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6130"/> + <source>Warning: {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6137"/> + <source>Error: {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6468"/> + <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="4539"/> + <source>Activating Auto-Completion Provider</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="4539"/> + <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="4859"/> + <source>Activating Calltip Provider</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="4859"/> + <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="789"/> + <source>Open 'rejection' file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="896"/> + <source>Load Diagram...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1210"/> + <source>Next change</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../QScintilla/Editor.py" line="1213"/> - <source>LMB toggles bookmarks</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1217"/> - <source>LMB toggles breakpoints</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1253"/> - <source>Export source</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1245"/> - <source><p>No exporter available for the export format <b>{0}</b>. Aborting...</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1253"/> - <source>No export format given. Aborting...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1264"/> - <source>Alternatives ({0})</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1284"/> - <source>Pygments Lexer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1284"/> - <source>Select the Pygments lexer to apply.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1752"/> - <source>Modification of Read Only file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1752"/> - <source>You are attempting to change a read only file. Please save to a different file first.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2443"/> - <source>Printing...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2460"/> - <source>Printing completed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2462"/> - <source>Error while printing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2465"/> - <source>Printing aborted</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2823"/> - <source>File Modified</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2823"/> - <source><p>The file <b>{0}</b> has unsaved changes.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2878"/> - <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="3041"/> - <source>Save File</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2982"/> - <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="3041"/> - <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="4427"/> - <source>Autocompletion</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="4427"/> - <source>Autocompletion is not available because there is no autocompletion source set.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5157"/> - <source>Disable breakpoint</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5531"/> - <source>Code Coverage</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5531"/> - <source>Please select a coverage file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5594"/> - <source>Show Code Coverage Annotations</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5587"/> - <source>All lines have been covered.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5594"/> - <source>There is no coverage file available.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5709"/> - <source>Profile Data</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5709"/> - <source>Please select a profile file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5869"/> - <source>Syntax Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5869"/> - <source>No syntax error message available.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6184"/> - <source>Macro Name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6184"/> - <source>Select a macro name:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6212"/> - <source>Load macro file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6255"/> - <source>Macro files (*.macro)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6235"/> - <source>Error loading macro</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6226"/> - <source><p>The macro file <b>{0}</b> could not be read.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6235"/> - <source><p>The macro file <b>{0}</b> is corrupt.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6255"/> - <source>Save macro file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6272"/> - <source>Save macro</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6272"/> - <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6288"/> - <source>Error saving macro</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6288"/> - <source><p>The macro file <b>{0}</b> could not be written.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6301"/> - <source>Start Macro Recording</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6301"/> - <source>Macro recording is already active. Start new?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6327"/> - <source>Macro Recording</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6327"/> - <source>Enter name of the macro:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6465"/> - <source>File changed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6629"/> - <source>{0} (ro)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6769"/> - <source>Drop Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6769"/> - <source><p><b>{0}</b> is not a file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6790"/> - <source>Resources</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6792"/> - <source>Add file...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6794"/> - <source>Add files...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6796"/> - <source>Add aliased file...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6799"/> - <source>Add localized resource...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6803"/> - <source>Add resource frame</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6822"/> - <source>Add file resource</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6838"/> - <source>Add file resources</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6866"/> - <source>Add aliased file resource</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6866"/> - <source>Alias for file <b>{0}</b>:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6930"/> - <source>Package Diagram</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6930"/> - <source>Include class attributes?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6950"/> - <source>Imports Diagram</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6950"/> - <source>Include imports from external modules?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6964"/> - <source>Application Diagram</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6964"/> - <source>Include module names?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="7245"/> - <source>Add to dictionary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="7247"/> - <source>Ignore All</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6123"/> - <source>Warning: {0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6130"/> - <source>Error: {0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6461"/> - <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="4532"/> - <source>Activating Auto-Completion Provider</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="4532"/> - <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="4852"/> - <source>Activating Calltip Provider</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="4852"/> - <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="786"/> - <source>Open 'rejection' file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="893"/> - <source>Load Diagram...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1207"/> - <source>Next change</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1210"/> <source>Previous change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7659"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7659"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6059"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6059"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6120"/> + <location filename="../QScintilla/Editor.py" line="6127"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="760"/> - <source>New Document View</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="763"/> + <source>New Document View</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="766"/> <source>New Document View (with new split)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="847"/> + <location filename="../QScintilla/Editor.py" line="850"/> <source>Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="975"/> + <location filename="../QScintilla/Editor.py" line="978"/> <source>Re-Open With Encoding</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6455"/> + <location filename="../QScintilla/Editor.py" line="6462"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="738"/> + <location filename="../QScintilla/Editor.py" line="741"/> <source>Automatic Completion enabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="816"/> + <location filename="../QScintilla/Editor.py" line="819"/> <source>Complete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4581"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4581"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7746"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7746"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="780"/> + <location filename="../QScintilla/Editor.py" line="783"/> <source>Save Copy...</source> <translation type="unfinished"></translation> </message> @@ -9867,7 +9867,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> <source>Add from installed APIs</source> <translation type="unfinished"></translation> </message> @@ -9877,7 +9877,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> <source>Add from Plugin APIs</source> <translation type="unfinished"></translation> </message> @@ -9887,7 +9887,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="299"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="301"/> <source>Compile APIs</source> <translation type="unfinished"></translation> </message> @@ -9897,22 +9897,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="238"/> <source>Select from the list of installed API files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> <source>Select from the list of API files installed by plugins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="314"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="316"/> <source>Cancel compilation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> <source>There are no APIs installed yet. Selection is not available.</source> <translation type="unfinished"></translation> </message> @@ -10079,6 +10079,89 @@ </message> </context> <context> + <name>EditorButtonsWidget</name> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="175"/> + <source>Bold</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="177"/> + <source>Italic</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="179"/> + <source>Strike Through</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="182"/> + <source>Header 1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="184"/> + <source>Header 2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="186"/> + <source>Header 3</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="188"/> + <source>Header</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="193"/> + <source>Inline Code</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="195"/> + <source>Code Block</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="197"/> + <source>Quote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="200"/> + <source>Add Hyperlink</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="202"/> + <source>Add Horizontal Line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="204"/> + <source>Add Image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="207"/> + <source>Add Bulleted List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="209"/> + <source>Add Numbered List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="273"/> + <source>Level {0}</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>EditorCalltipsPage</name> <message> <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="17"/> @@ -10887,7 +10970,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightersPage.py" line="142"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightersPage.py" line="146"/> <source>Alternative</source> <translation type="unfinished"></translation> </message> @@ -10950,7 +11033,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> <source>Fill to end of line</source> <translation type="unfinished"></translation> </message> @@ -11060,42 +11143,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="351"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="355"/> <source>Enabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="352"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="356"/> <source>Disabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> <source>Select fill to end of line for all styles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465"/> <source>Export Highlighting Styles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="477"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="481"/> <source>Highlighting styles file (*.e4h)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465"/> <source><p>The highlighting styles could not be exported to file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="497"/> <source>Import Highlighting Styles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="497"/> <source><p>The highlighting styles could not be read from file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -11207,12 +11290,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1048"/> <source>Select whether folding of comments shall be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1051"/> <source>Fold comments</source> <translation type="unfinished"></translation> </message> @@ -11222,22 +11305,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="990"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/> <source>Select whether folding at else statement should be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/> <source>Fold at else</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="522"/> <source>Select whether folding of preprocessor directives shall be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="525"/> <source>Fold preprocessor directives</source> <translation type="unfinished"></translation> </message> @@ -11347,187 +11430,187 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/> <source>Pascal Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="503"/> - <source>Select to enable smart highlighting of keywords</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/> - <source>Smart Highlighting</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="516"/> - <source>Perl Lexer Properties</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/> - <source>Select to enable folding of Perl packages</source> + <source>Select to enable smart highlighting of keywords</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="535"/> - <source>Fold packages</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="542"/> - <source>Select to enable folding of Perl POD blocks</source> + <source>Smart Highlighting</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/> + <source>Perl Lexer Properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="561"/> + <source>Select to enable folding of Perl packages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="564"/> + <source>Fold packages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="571"/> + <source>Select to enable folding of Perl POD blocks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="574"/> <source>Fold POD blocks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="565"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="594"/> <source>PostScript Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="581"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="610"/> <source>Select to mark tokens</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="584"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="613"/> <source>Mark Tokens</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="593"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="622"/> <source>PostScript Level:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="600"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="629"/> <source>Select the PostScript level</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="637"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/> <source>Povray Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="643"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/> <source>Select whether folding of directives shall be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="646"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/> <source>Fold directives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="685"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> <source>Python Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="796"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="825"/> <source>Select whether bad indentation shall be highlighted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="730"/> <source>Select whether folding of strings shall be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="733"/> <source>Fold strings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="721"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="750"/> <source>Select whether text should be autoindented after a ':'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="724"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="753"/> <source>Auto indentation after ':'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="741"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="770"/> <source>Select to allow Python v2 unicode string literals (e.g. u"utf8")</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="744"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="773"/> <source>Allow v2 unicode string literals</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="751"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="780"/> <source>Select to allow Python v3 binary and octal literals (e.g. 0b1011, 0o712)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="754"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/> <source>Allow v3 binary and octal literals</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="761"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="790"/> <source>Select to allow Python v3 bytes string literals (e.g. b"bytes")</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="764"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="793"/> <source>Allow v3 bytes string literals</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="827"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/> <source>SQL Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="863"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="892"/> <source>Select to enable Backslash Escapes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="866"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="895"/> <source>Backslash Escapes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="964"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/> <source>VHDL Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="999"/> <source>Select whether folding of blocks at a parenthesis shall be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1002"/> <source>Fold at parenthesis</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1009"/> <source>Select whether folding of begin blocks shall be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1012"/> <source>Fold at begin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1013"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1042"/> <source>YAML Lexer Properties</source> <translation type="unfinished"></translation> </message> @@ -11562,112 +11645,112 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="695"/> <source>Properties Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/> <source>Select to allow initial spaces in a line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/> <source>Allow initial spaces</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="740"/> <source>Select whether folding of triple quoted strings shall be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="743"/> <source>Fold triple quoted strings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="760"/> <source>Select to allow strings to span newline characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="734"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="763"/> <source>Strings may span newline characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="808"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="837"/> <source>Ruby Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="853"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="882"/> <source>Select whether only BEGIN blocks can be folded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="885"/> <source>Only BEGIN blocks can be folded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="873"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="902"/> <source>Select if words may contain dots</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="876"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="905"/> <source>Words may contain dots</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="883"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="912"/> <source>Select to allow '#' as a comment character</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="886"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="915"/> <source>Allow '#' as comment character</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="893"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="922"/> <source>Select to enable quoted identifiers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="896"/> - <source>Enable quoted identifiers</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="906"/> - <source>TCL Lexer Properties</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="925"/> - <source>TeX Lexer Properties</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="941"/> - <source>Select to treat comments as TeX source</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="944"/> - <source>Treat comments as TeX source</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="951"/> - <source>Select to treat \if<unknown> as a command</source> + <source>Enable quoted identifiers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="935"/> + <source>TCL Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="954"/> + <source>TeX Lexer Properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/> + <source>Select to treat comments as TeX source</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/> + <source>Treat comments as TeX source</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/> + <source>Select to treat \if<unknown> as a command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/> <source>Treat \if<unknown> as command</source> <translation type="unfinished"></translation> </message> @@ -11677,7 +11760,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="774"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="803"/> <source>Highlight sub-identifiers</source> <translation type="unfinished"></translation> </message> @@ -11687,7 +11770,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="771"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="800"/> <source>Select to highlight sub-identifiers defined in keyword set 2</source> <translation type="unfinished"></translation> </message> @@ -11742,32 +11825,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="812"/> <source>Highlight bad indentation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>No Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Inconsistent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Tabs after Spaces</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Spaces</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Tabs</source> <translation type="unfinished"></translation> </message> @@ -11787,7 +11870,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="194"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/> <source>Highlight escape sequences</source> <translation type="unfinished"></translation> </message> @@ -11801,6 +11884,26 @@ <source>Allow verbatim string escape sequences</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/> + <source>JSON</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="483"/> + <source>Select to enable highlighting of line/block comments</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="486"/> + <source>Highlight comments</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/> + <source>Select to enable highlighting of escape sequences in strings</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSearchPage</name> @@ -12905,6 +13008,16 @@ <source>Select the colour for the search marker</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1866"/> + <source>Select to hide the Format Buttons bar when formatting is not supported</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1869"/> + <source>Hide Format Buttons bar when not supported</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSyntaxPage</name> @@ -13170,7 +13283,7 @@ <context> <name>EmailDialog</name> <message> - <location filename="../UI/EmailDialog.py" line="339"/> + <location filename="../UI/EmailDialog.py" line="346"/> <source>Send bug report</source> <translation type="unfinished"></translation> </message> @@ -13265,27 +13378,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="293"/> + <location filename="../UI/EmailDialog.py" line="300"/> <source>Mail Server Password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="293"/> + <location filename="../UI/EmailDialog.py" line="300"/> <source>Enter your mail server password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="311"/> + <location filename="../UI/EmailDialog.py" line="318"/> <source><p>Authentication failed.<br>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="339"/> + <location filename="../UI/EmailDialog.py" line="346"/> <source><p>Message could not be sent.<br>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="357"/> + <location filename="../UI/EmailDialog.py" line="364"/> <source>Attach file</source> <translation type="unfinished"></translation> </message> @@ -13308,100 +13421,125 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/> - <source>Outgoing mail server port:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="60"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="124"/> <source>Enter the port of the mail server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="92"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/> <source>Email address:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="99"/> - <source>Enter your email address</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="106"/> - <source>Signature:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="116"/> - <source>Enter your email signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="128"/> - <source>Select to use TLS</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="131"/> - <source>Use TLS</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="138"/> - <source>Select to authenticatate against the mail server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="141"/> - <source>Mail server needs authentication</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="153"/> - <source>Username:</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/> + <source>Enter your email address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="170"/> + <source>Signature:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="180"/> + <source>Enter your email signature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="104"/> + <source>Select to use TLS</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="192"/> + <source>Select to authenticatate against the mail server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="195"/> + <source>Mail server needs authentication</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="204"/> + <source>Username:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="211"/> <source>Enter your mail server username</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="173"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="218"/> <source>Password:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="183"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="225"/> <source>Enter your password for accessing the mail server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="193"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="235"/> <source>Press to test the login data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="196"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="238"/> <source>Test Login</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/> <source>Login Test</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="138"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="204"/> <source>The login test succeeded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/> <source><p>The login test failed.<br>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/> + <source>Encryption Method:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="81"/> + <source>Select to use no encryption</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="84"/> + <source>None</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="94"/> + <source>Select to use SSL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="97"/> + <source>SSL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="107"/> + <source>TLS</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="117"/> + <source>Port:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EricAccessHandler</name> @@ -14296,54 +14434,54 @@ <context> <name>ExceptionsFilterDialog</name> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="13"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="14"/> <source>Exceptions Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="16"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="17"/> <source><b>Exception Filter</b> <p>This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the "Start Debugging" dialog is unchecked, no exception will be reported at all.</p> <p>Please note, that unhandled exceptions are always highlighted independent of these settings.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="27"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="28"/> <source>List of exceptions that shall be highlighted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="42"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="41"/> <source>Press to add the entered exception to the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="45"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="44"/> <source>Add</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="52"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="51"/> <source>Enter an exception type that shall be highlighted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="66"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="61"/> <source>Press to delete the selected exception from the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="69"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="64"/> <source>Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="76"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="71"/> <source>Press to delete all exceptions from the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="79"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="74"/> <source>Delete All</source> <translation type="unfinished"></translation> </message> @@ -21325,7 +21463,7 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1822"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -21375,147 +21513,147 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1057"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1359"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2022"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2427"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2451"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2475"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2604"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2623"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2578"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2625"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2710"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2730"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2727"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2759"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -21525,72 +21663,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2959"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -21605,157 +21743,157 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1030"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="997"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1133"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3614"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3924"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -24038,7 +24176,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> @@ -24078,17 +24216,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> <source>Author</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="103"/> <source>Message</source> <translation type="unfinished"></translation> </message> @@ -24113,192 +24251,192 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="285"/> <source>Action</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="290"/> <source>Path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="295"/> <source>Copy from</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="306"/> <source>Press to get the next bunch of log entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="309"/> <source>&Next</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="316"/> <source>Enter the limit of entries to fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="335"/> <source>Select to stop listing log messages at a copy or move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="338"/> <source>Stop on Copy/Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="378"/> <source>Press to generate a diff to the first parent revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="381"/> <source>Diff to Parent &1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> <source>Press to generate a diff to the second parent revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="391"/> <source>Diff to Parent &2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="398"/> <source>Press to compare two revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="401"/> <source>&Compare Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="462"/> <source>Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="468"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="484"/> <source>Input</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="474"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="506"/> <source>Press to send the input to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="477"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="509"/> <source>&Send</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="512"/> <source>Alt+S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="519"/> <source>Enter data to be sent to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="526"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="529"/> <source>&Password Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="532"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> <source>Added</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169"/> <source>Deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source>Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="147"/> <source>All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="666"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="747"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="669"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="750"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="753"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="993"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="993"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="77"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="90"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> @@ -24308,83 +24446,83 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="227"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1899"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2091"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="444"/> <source>Select to show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="421"/> <source>Select action from menu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> - <source>Tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="204"/> - <source>Tag the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1773"/> - <source>Switch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="209"/> - <source>Switch the working directory to the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/> + <source>Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="235"/> + <source>Tag the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1951"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="240"/> + <source>Switch the working directory to the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="265"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="983"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1087"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -24409,342 +24547,168 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Find</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> - <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2192"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2192"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174"/> <source>Draft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> <source>Public</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/> <source>Secret</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2049"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="261"/> <source>Pull changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="274"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1852"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2030"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2091"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> <source>Fetch changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="291"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="245"/> <source>Define Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="248"/> <source>Bookmark the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250"/> <source>Move Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253"/> <source>Move bookmark to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1972"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1972"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1816"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1994"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1816"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1994"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1937"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>HgLogDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="14"/> - <source>Mercurial Log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="26"/> - <source>Log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="32"/> - <source><b>Mercurial Log</b><p>This shows the output of the hg log command. By clicking on the links you may show the difference between revisions.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="61"/> - <source>Errors</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="67"/> - <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="83"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="105"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="108"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="111"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="118"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="125"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="128"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="131"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="64"/> - <source><b>Processing your request, please wait...</b></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="74"/> - <source>Revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="270"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> - <source>Could not start the hg executable.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="276"/> - <source>Mercurial Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/> - <source>No log available for '{0}'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="344"/> - <source>diff to {0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="358"/> - <source>Tags: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="364"/> - <source>Parents: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="367"/> - <source><i>Author: {0}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="371"/> - <source><i>Date: {0}, {1}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="382"/> - <source>Added {0} (copied from {1})<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="387"/> - <source>Added {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="393"/> - <source>Modified {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="399"/> - <source>Deleted {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="361"/> - <source>Bookmarks: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="352"/> - <source>Phase: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="45"/> - <source>Select to show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="48"/> - <source>Show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="355"/> - <source>Branch: {0}<br /> -</source> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr><tr><td><b>Children</b></td><td>{5}</td></tr>{6}</table></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="368"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> + <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> </context> @@ -25102,87 +25066,82 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="605"/> <source>Version Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="617"/> <source>Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> <source>Add to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628"/> <source>Remove from repository (and disk)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Remove from repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="548"/> - <source>Show log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="552"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="544"/> <source>Show log browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> <source>Show status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="343"/> <source>Show annotated file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="663"/> <source>Select all local file entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="665"/> <source>Select all versioned file entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> <source>Select all local directory entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="669"/> <source>Select all versioned directory entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Do you really want to remove these files from the repository?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="539"/> <source>Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="541"/> <source>Move</source> <translation type="unfinished"></translation> </message> @@ -25192,42 +25151,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="639"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="329"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="651"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="643"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="338"/> <source>Show differences side-by-side (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="653"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="656"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="672"/> <source>Configure...</source> <translation type="unfinished"></translation> </message> @@ -25391,1266 +25350,1246 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> - <source>Show log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> - <source>Show &log</source> + <source>Show log browser</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> - <source>Show the log of the local project</source> + <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> - <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> - <source>Show log browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> - <source>Show a dialog to browse the log of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show &difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> <source>Show status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> <source>Show the status of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> <source>Show heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Show the heads of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357"/> <source>Show parents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Show the parents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="371"/> <source>Show tip</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <source>Show the tip of the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> + <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <source>Re&vert changes</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> - <source>Show the tip of the repository</source> + <source>Revert all changes made to the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> - <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> - <source>Revert changes</source> + <source>Merge</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> - <source>Re&vert changes</source> + <source>Mer&ge changes...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> - <source>Revert all changes made to the local project</source> + <source>Merge changes of a revision into the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> - <source>Merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> - <source>Mer&ge changes...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> - <source>Merge changes of a revision into the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <source>Tag in repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <source>&Tag in repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <source>Tag the local project in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> - <source>Tag in repository</source> + <source>List tags</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> - <source>&Tag in repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> - <source>Tag the local project in the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> - <source>List tags</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>List branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>List branches...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> + <source>List branches of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create &branch...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> - <source>List branches of the project</source> + <source>Create a new branch for the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Create branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Create &branch...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> - <source>Create a new branch for the local project in the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> <source>Close branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> <source>Close the current branch of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> - <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> - <source>Show current branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> - <source>Show the current branch of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> - <source>Switch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> - <source>S&witch...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Switch the working directory to another revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> - <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source>Cleanup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source>Cleanu&p</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> - <source>Cleanup the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>Execute command</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>E&xecute command...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> - <source>Execute an arbitrary Mercurial command</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Configure</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Configure...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> - <source>Show the configuration dialog with the Mercurial page selected</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> - <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> - <source>Show paths</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> - <source>Show paths...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> - <source>Show the aliases for remote repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source>Verify repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source>Verify repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> - <source>Verify the integrity of the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> - <source>Recover</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> - <source>Recover...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> - <source>Recover from an interrupted transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> - <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> - <source>Identify</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> - <source>Identify...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> - <source>Identify the project directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> - <source><b>Identify</b><p>This identifies the project directory.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> - <source>Create .hgignore</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> - <source>Create a .hgignore file with default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> - <source>Create changegroup...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> - <source>Create changegroup file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> - <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> - <source>Preview changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> - <source>Preview changegroup...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> - <source>Preview a changegroup file containing a collection of changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> - <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1810"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> - <source>Apply changegroups...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> - <source>Apply one or several changegroup files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> - <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source>Mark as "good"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source>Mark as "good"...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> - <source>Mark as "bad"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> - <source>Mark as "bad"...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> - <source>Mark a selectable changeset as bad</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> - <source>Skip</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> - <source>Reset</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> - <source>Reset the bisect search data</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> - <source>Back out changeset</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> - <source>Back out changes of an earlier changeset</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> - <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> - <source>Serve project repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> - <source>Serve project repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> - <source>Serve the project repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> - <source><b>Serve project repository</b><p>This serves the project repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1315"/> - <source>Specials</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1324"/> - <source>Changegroup Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> - <source>Bisect</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1627"/> - <source>Pull</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/> - <source>The project should be reread. Do this now?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> - <source>Push new branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> - <source>Push the current branch of the local project as a new named branch</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> + <source>Show current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Show the current branch of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <source>S&witch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <source>Switch the working directory to another revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Cleanup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Cleanu&p</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> + <source>Cleanup the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <source>Execute command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <source>E&xecute command...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <source>Execute an arbitrary Mercurial command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source>Configure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source>Configure...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <source>Show the configuration dialog with the Mercurial page selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> + <source>Show paths</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> + <source>Show paths...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> + <source>Show the aliases for remote repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <source>Verify repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <source>Verify repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> + <source>Verify the integrity of the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> + <source>Recover</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> + <source>Recover...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> + <source>Recover from an interrupted transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> + <source>Identify</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> + <source>Identify...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> + <source>Identify the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <source><b>Identify</b><p>This identifies the project directory.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> + <source>Create .hgignore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> + <source>Create changegroup file collecting changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> + <source>Preview changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <source>Preview a changegroup file containing a collection of changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1793"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> + <source>Apply changegroups...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <source>Mark as "good"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> + <source>Mark a selectable changeset as good</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> + <source>Mark as "bad"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> + <source>Mark as "bad"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> + <source>Mark a selectable changeset as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> + <source>Skip</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <source>Reset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> + <source>Reset the bisect search data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <source>Back out changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> + <source>Back out changes of an earlier changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> + <source>Serve project repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> + <source>Serve project repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> + <source>Serve the project repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/> + <source><b>Serve project repository</b><p>This serves the project repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1300"/> + <source>Specials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> + <source>Bisect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1610"/> + <source>Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> + <source>Push new branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> + <source>Push the current branch of the local project as a new named branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <source>Show an editor to edit the repository configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Edit repository configuration</source> + <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Edit repository configuration...</source> + <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> - <source>Show an editor to edit the repository configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1849"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1316"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1869"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Export Patches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <source>Export revisions to patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> - <source>Export Patches...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1889"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> - <source>Change the phase of revisions</source> + <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> - <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1906"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1393"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/> - <source>Copy Changesets (Continue)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <source>Add</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <source>Add...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <source>Add a sub-repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Add</source> + <source>Remove</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Add...</source> + <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> - <source>Add a sub-repository</source> + <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> - <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> - <source>Remove</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> - <source>Remove...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> - <source>Remove sub-repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> + <source>Show &status...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> - <source>Show &status...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <source>Show summary...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> <source>Show summary information of the working directory status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> <source>Cancel uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> <source>Cancel an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <source>List bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <source>List bookmarks...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <source>List bookmarks of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>List bookmarks</source> + <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>List bookmarks...</source> + <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> - <source>List bookmarks of the project</source> + <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Define bookmark</source> + <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Define bookmark...</source> + <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> - <source>Define a bookmark for the project</source> + <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Delete bookmark</source> + <source>Rename bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Delete bookmark...</source> + <source>Rename bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <source>Delete a bookmark of the project</source> + <source>Rename a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Rename bookmark</source> + <source>Move bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Rename bookmark...</source> + <source>Move bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> - <source>Rename a bookmark of the project</source> + <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source>Move bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source>Move bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> - <source>Move a bookmark of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1144"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> <source>Show incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Pull bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <source>Re-Merge all conflicting, unresolved files of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> - <source>Re-Merge all conflicting, unresolved files of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Show conflicts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Show conflicts...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> - <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> - <source>Conflicts unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> - <source>Mark all conflicts of the local project as unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> - <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> - <source>Manage Changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> + <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <source>Mark all conflicts of the local project as unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> + <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> + <source>Manage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>Mercurial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> @@ -29699,6 +29638,42 @@ </message> </context> <context> + <name>HtmlProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/HtmlProvider.py" line="388"/> + <source>Create List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HtmlProvider.py" line="388"/> + <source>Enter desired number of list elements:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HyperlinkMarkupDialog</name> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="14"/> + <source>Insert Hyperlink</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="23"/> + <source>Link Text:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="33"/> + <source>Link Target:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="43"/> + <source>Link Title:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>IExplorerImporter</name> <message> <location filename="../WebBrowser/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="40"/> @@ -29900,1061 +29875,1086 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="128"/> + <location filename="../IconEditor/IconEditorWindow.py" line="130"/> <source>Graphic Interchange Format File (*.gif)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="129"/> - <source>Windows Icon File (*.ico)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="130"/> - <source>JPEG File (*.jpg)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="132"/> - <source>Multiple-Image Network Graphics File (*.mng)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="133"/> - <source>Portable Bitmap File (*.pbm)</source> + <source>Windows Icon File (*.ico)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="134"/> - <source>Paintbrush Bitmap File (*.pcx)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="135"/> - <source>Portable Graymap File (*.pgm)</source> + <source>JPEG File (*.jpg)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="136"/> - <source>Portable Network Graphics File (*.png)</source> + <source>Multiple-Image Network Graphics File (*.mng)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="137"/> - <source>Portable Pixmap File (*.ppm)</source> + <source>Portable Bitmap File (*.pbm)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="138"/> - <source>Silicon Graphics Image File (*.sgi)</source> + <source>Paintbrush Bitmap File (*.pcx)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="139"/> - <source>Scalable Vector Graphics File (*.svg)</source> + <source>Portable Graymap File (*.pgm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="140"/> + <source>Portable Network Graphics File (*.png)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="141"/> + <source>Portable Pixmap File (*.ppm)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="142"/> - <source>Targa Graphic File (*.tga)</source> + <source>Silicon Graphics Image File (*.sgi)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="143"/> - <source>TIFF File (*.tif)</source> + <source>Scalable Vector Graphics File (*.svg)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="146"/> - <source>X11 Bitmap File (*.xbm)</source> + <source>Targa Graphic File (*.tga)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="147"/> + <source>TIFF File (*.tif)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="151"/> + <source>X11 Bitmap File (*.xbm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="152"/> <source>X11 Pixmap File (*.xpm)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="158"/> + <location filename="../IconEditor/IconEditorWindow.py" line="163"/> <source>All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>New</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>&New</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>Ctrl+N</source> <comment>File|New</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="196"/> + <location filename="../IconEditor/IconEditorWindow.py" line="201"/> <source>Create a new icon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="197"/> + <location filename="../IconEditor/IconEditorWindow.py" line="202"/> <source><b>New</b><p>This creates a new icon.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="204"/> + <location filename="../IconEditor/IconEditorWindow.py" line="209"/> <source>New Window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="204"/> - <source>New &Window</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="209"/> + <source>New &Window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="214"/> <source>Open a new icon editor window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="211"/> + <location filename="../IconEditor/IconEditorWindow.py" line="216"/> <source><b>New Window</b><p>This opens a new icon editor window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>&Open...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>Ctrl+O</source> <comment>File|Open</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="224"/> + <location filename="../IconEditor/IconEditorWindow.py" line="229"/> <source>Open an icon file for editing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="225"/> + <location filename="../IconEditor/IconEditorWindow.py" line="230"/> <source><b>Open File</b><p>This opens a new icon file for editing. It pops up a file selection dialog.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>&Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>Ctrl+S</source> <comment>File|Save</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="239"/> + <location filename="../IconEditor/IconEditorWindow.py" line="244"/> <source>Save the current icon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="240"/> + <location filename="../IconEditor/IconEditorWindow.py" line="245"/> <source><b>Save File</b><p>Save the contents of the icon editor window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Save As</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Save &As...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Shift+Ctrl+S</source> <comment>File|Save As</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="253"/> + <location filename="../IconEditor/IconEditorWindow.py" line="258"/> <source>Save the current icon to a new file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="255"/> + <location filename="../IconEditor/IconEditorWindow.py" line="260"/> <source><b>Save As...</b><p>Saves the current icon to a new file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>Close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>&Close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>Ctrl+W</source> <comment>File|Close</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="268"/> + <location filename="../IconEditor/IconEditorWindow.py" line="273"/> <source>Close the current icon editor window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="270"/> + <location filename="../IconEditor/IconEditorWindow.py" line="275"/> <source><b>Close</b><p>Closes the current icon editor window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="277"/> + <location filename="../IconEditor/IconEditorWindow.py" line="282"/> <source>Close All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="277"/> + <location filename="../IconEditor/IconEditorWindow.py" line="282"/> <source>Close &All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="281"/> + <location filename="../IconEditor/IconEditorWindow.py" line="286"/> <source>Close all icon editor windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="283"/> + <location filename="../IconEditor/IconEditorWindow.py" line="288"/> <source><b>Close All</b><p>Closes all icon editor windows except the first one.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>&Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>Ctrl+Q</source> <comment>File|Quit</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="309"/> + <location filename="../IconEditor/IconEditorWindow.py" line="314"/> <source>Quit the icon editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="310"/> + <location filename="../IconEditor/IconEditorWindow.py" line="315"/> <source><b>Quit</b><p>Quit the icon editor.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Undo</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>&Undo</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Ctrl+Z</source> <comment>Edit|Undo</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Alt+Backspace</source> <comment>Edit|Undo</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="329"/> + <location filename="../IconEditor/IconEditorWindow.py" line="334"/> <source>Undo the last change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="330"/> + <location filename="../IconEditor/IconEditorWindow.py" line="335"/> <source><b>Undo</b><p>Undo the last change done.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>Redo</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>&Redo</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>Ctrl+Shift+Z</source> <comment>Edit|Redo</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="343"/> + <location filename="../IconEditor/IconEditorWindow.py" line="348"/> <source>Redo the last change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="344"/> + <location filename="../IconEditor/IconEditorWindow.py" line="349"/> <source><b>Redo</b><p>Redo the last change done.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Cut</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Cu&t</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Ctrl+X</source> <comment>Edit|Cut</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Shift+Del</source> <comment>Edit|Cut</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="358"/> + <location filename="../IconEditor/IconEditorWindow.py" line="363"/> <source>Cut the selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="359"/> + <location filename="../IconEditor/IconEditorWindow.py" line="364"/> <source><b>Cut</b><p>Cut the selected image area to the clipboard.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Ctrl+C</source> <comment>Edit|Copy</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Ctrl+Ins</source> <comment>Edit|Copy</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="373"/> + <location filename="../IconEditor/IconEditorWindow.py" line="378"/> <source>Copy the selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="374"/> + <location filename="../IconEditor/IconEditorWindow.py" line="379"/> <source><b>Copy</b><p>Copy the selected image area to the clipboard.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Paste</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>&Paste</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Ctrl+V</source> <comment>Edit|Paste</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Shift+Ins</source> <comment>Edit|Paste</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="388"/> + <location filename="../IconEditor/IconEditorWindow.py" line="393"/> <source>Paste the clipboard image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="389"/> + <location filename="../IconEditor/IconEditorWindow.py" line="394"/> <source><b>Paste</b><p>Paste the clipboard image.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="396"/> + <location filename="../IconEditor/IconEditorWindow.py" line="401"/> <source>Paste as New</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="396"/> + <location filename="../IconEditor/IconEditorWindow.py" line="401"/> <source>Paste as &New</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="400"/> + <location filename="../IconEditor/IconEditorWindow.py" line="405"/> <source>Paste the clipboard image replacing the current one</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="402"/> + <location filename="../IconEditor/IconEditorWindow.py" line="407"/> <source><b>Paste as New</b><p>Paste the clipboard image replacing the current one.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Clear</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Cl&ear</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Alt+Shift+C</source> <comment>Edit|Clear</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="416"/> + <location filename="../IconEditor/IconEditorWindow.py" line="421"/> <source>Clear the icon image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="417"/> + <location filename="../IconEditor/IconEditorWindow.py" line="422"/> <source><b>Clear</b><p>Clear the icon image and set it to be completely transparent.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>Select All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>&Select All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>Ctrl+A</source> <comment>Edit|Select All</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="431"/> + <location filename="../IconEditor/IconEditorWindow.py" line="436"/> <source>Select the complete icon image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="433"/> + <location filename="../IconEditor/IconEditorWindow.py" line="438"/> <source><b>Select All</b><p>Selects the complete icon image.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="440"/> + <location filename="../IconEditor/IconEditorWindow.py" line="445"/> <source>Change Size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="440"/> + <location filename="../IconEditor/IconEditorWindow.py" line="445"/> <source>Change Si&ze...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="446"/> + <location filename="../IconEditor/IconEditorWindow.py" line="451"/> <source>Change the icon size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="447"/> + <location filename="../IconEditor/IconEditorWindow.py" line="452"/> <source><b>Change Size...</b><p>Changes the icon size.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="454"/> + <location filename="../IconEditor/IconEditorWindow.py" line="459"/> <source>Grayscale</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="454"/> + <location filename="../IconEditor/IconEditorWindow.py" line="459"/> <source>&Grayscale</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="460"/> + <location filename="../IconEditor/IconEditorWindow.py" line="465"/> <source>Change the icon to grayscale</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="462"/> + <location filename="../IconEditor/IconEditorWindow.py" line="467"/> <source><b>Grayscale</b><p>Changes the icon to grayscale.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Zoom in</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Zoom &in</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Ctrl++</source> <comment>View|Zoom in</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="497"/> + <location filename="../IconEditor/IconEditorWindow.py" line="502"/> <source>Zoom in on the icon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="498"/> + <location filename="../IconEditor/IconEditorWindow.py" line="503"/> <source><b>Zoom in</b><p>Zoom in on the icon. This makes the grid bigger.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Zoom out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Zoom &out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Ctrl+-</source> <comment>View|Zoom out</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="511"/> + <location filename="../IconEditor/IconEditorWindow.py" line="516"/> <source>Zoom out on the icon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="512"/> + <location filename="../IconEditor/IconEditorWindow.py" line="517"/> <source><b>Zoom out</b><p>Zoom out on the icon. This makes the grid smaller.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Zoom reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Zoom &reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Ctrl+0</source> <comment>View|Zoom reset</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="525"/> + <location filename="../IconEditor/IconEditorWindow.py" line="530"/> <source>Reset the zoom of the icon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="527"/> + <location filename="../IconEditor/IconEditorWindow.py" line="532"/> <source><b>Zoom reset</b><p>Reset the zoom of the icon. This sets the zoom factor to 100%.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="535"/> + <location filename="../IconEditor/IconEditorWindow.py" line="540"/> <source>Show Grid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="535"/> + <location filename="../IconEditor/IconEditorWindow.py" line="540"/> <source>Show &Grid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="541"/> + <location filename="../IconEditor/IconEditorWindow.py" line="546"/> <source>Toggle the display of the grid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="543"/> + <location filename="../IconEditor/IconEditorWindow.py" line="548"/> <source><b>Show Grid</b><p>Toggle the display of the grid.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="562"/> + <location filename="../IconEditor/IconEditorWindow.py" line="567"/> <source>Freehand</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="562"/> + <location filename="../IconEditor/IconEditorWindow.py" line="567"/> <source>&Freehand</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="568"/> + <location filename="../IconEditor/IconEditorWindow.py" line="573"/> <source><b>Free hand</b><p>Draws non linear lines.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="577"/> + <location filename="../IconEditor/IconEditorWindow.py" line="582"/> <source>Color Picker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="577"/> + <location filename="../IconEditor/IconEditorWindow.py" line="582"/> <source>&Color Picker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="583"/> + <location filename="../IconEditor/IconEditorWindow.py" line="588"/> <source><b>Color Picker</b><p>The color of the pixel clicked on will become the current draw color.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="594"/> + <location filename="../IconEditor/IconEditorWindow.py" line="599"/> <source>Rectangle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="594"/> + <location filename="../IconEditor/IconEditorWindow.py" line="599"/> <source>&Rectangle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="600"/> + <location filename="../IconEditor/IconEditorWindow.py" line="605"/> <source><b>Rectangle</b><p>Draw a rectangle.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="609"/> + <location filename="../IconEditor/IconEditorWindow.py" line="614"/> <source>Filled Rectangle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="609"/> + <location filename="../IconEditor/IconEditorWindow.py" line="614"/> <source>F&illed Rectangle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="615"/> + <location filename="../IconEditor/IconEditorWindow.py" line="620"/> <source><b>Filled Rectangle</b><p>Draw a filled rectangle.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="625"/> + <location filename="../IconEditor/IconEditorWindow.py" line="630"/> <source>Circle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="631"/> + <location filename="../IconEditor/IconEditorWindow.py" line="636"/> <source><b>Circle</b><p>Draw a circle.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="640"/> + <location filename="../IconEditor/IconEditorWindow.py" line="645"/> <source>Filled Circle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="640"/> + <location filename="../IconEditor/IconEditorWindow.py" line="645"/> <source>Fille&d Circle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="646"/> + <location filename="../IconEditor/IconEditorWindow.py" line="651"/> <source><b>Filled Circle</b><p>Draw a filled circle.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="656"/> + <location filename="../IconEditor/IconEditorWindow.py" line="661"/> <source>Ellipse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="656"/> + <location filename="../IconEditor/IconEditorWindow.py" line="661"/> <source>&Ellipse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="662"/> + <location filename="../IconEditor/IconEditorWindow.py" line="667"/> <source><b>Ellipse</b><p>Draw an ellipse.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="671"/> + <location filename="../IconEditor/IconEditorWindow.py" line="676"/> <source>Filled Ellipse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="671"/> + <location filename="../IconEditor/IconEditorWindow.py" line="676"/> <source>Fille&d Elli&pse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="677"/> + <location filename="../IconEditor/IconEditorWindow.py" line="682"/> <source><b>Filled Ellipse</b><p>Draw a filled ellipse.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="687"/> + <location filename="../IconEditor/IconEditorWindow.py" line="692"/> <source>Flood Fill</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="687"/> + <location filename="../IconEditor/IconEditorWindow.py" line="692"/> <source>Fl&ood Fill</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="693"/> + <location filename="../IconEditor/IconEditorWindow.py" line="698"/> <source><b>Flood Fill</b><p>Fill adjoining pixels with the same color with the current color.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="703"/> + <location filename="../IconEditor/IconEditorWindow.py" line="708"/> <source>Line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="703"/> + <location filename="../IconEditor/IconEditorWindow.py" line="708"/> <source>&Line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="709"/> + <location filename="../IconEditor/IconEditorWindow.py" line="714"/> <source><b>Line</b><p>Draw a line.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="718"/> + <location filename="../IconEditor/IconEditorWindow.py" line="723"/> <source>Eraser (Transparent)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="718"/> + <location filename="../IconEditor/IconEditorWindow.py" line="723"/> <source>Eraser (&Transparent)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="724"/> + <location filename="../IconEditor/IconEditorWindow.py" line="729"/> <source><b>Eraser (Transparent)</b><p>Erase pixels by setting them to transparent.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="733"/> + <location filename="../IconEditor/IconEditorWindow.py" line="738"/> <source>Rectangular Selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="750"/> + <location filename="../IconEditor/IconEditorWindow.py" line="755"/> <source>Rect&angular Selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="739"/> + <location filename="../IconEditor/IconEditorWindow.py" line="744"/> <source><b>Rectangular Selection</b><p>Select a rectangular section of the icon using the mouse.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="750"/> + <location filename="../IconEditor/IconEditorWindow.py" line="755"/> <source>Circular Selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="756"/> + <location filename="../IconEditor/IconEditorWindow.py" line="761"/> <source><b>Circular Selection</b><p>Select a circular section of the icon using the mouse.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="773"/> + <location filename="../IconEditor/IconEditorWindow.py" line="778"/> <source>About</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="773"/> + <location filename="../IconEditor/IconEditorWindow.py" line="778"/> <source>&About</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="777"/> + <location filename="../IconEditor/IconEditorWindow.py" line="782"/> <source>Display information about this software</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="779"/> + <location filename="../IconEditor/IconEditorWindow.py" line="784"/> <source><b>About</b><p>Display some information about this software.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="785"/> + <location filename="../IconEditor/IconEditorWindow.py" line="790"/> <source>About Qt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="785"/> + <location filename="../IconEditor/IconEditorWindow.py" line="790"/> <source>About &Qt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="789"/> + <location filename="../IconEditor/IconEditorWindow.py" line="794"/> <source>Display information about the Qt toolkit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="791"/> + <location filename="../IconEditor/IconEditorWindow.py" line="796"/> <source><b>About Qt</b><p>Display some information about the Qt toolkit.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>What's This?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>&What's This?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>Shift+F1</source> <comment>Help|What's This?'</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="804"/> + <location filename="../IconEditor/IconEditorWindow.py" line="809"/> <source>Context sensitive help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="805"/> + <location filename="../IconEditor/IconEditorWindow.py" line="810"/> <source><b>Display context sensitive help</b><p>In What's This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="822"/> + <location filename="../IconEditor/IconEditorWindow.py" line="827"/> <source>&File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="839"/> + <location filename="../IconEditor/IconEditorWindow.py" line="844"/> <source>&Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="855"/> + <location filename="../IconEditor/IconEditorWindow.py" line="860"/> <source>&View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="863"/> + <location filename="../IconEditor/IconEditorWindow.py" line="868"/> <source>&Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="882"/> + <location filename="../IconEditor/IconEditorWindow.py" line="887"/> <source>&Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="892"/> + <location filename="../IconEditor/IconEditorWindow.py" line="897"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="906"/> + <location filename="../IconEditor/IconEditorWindow.py" line="911"/> <source>Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="919"/> - <source>View</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="924"/> + <source>View</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="929"/> <source>Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="942"/> + <location filename="../IconEditor/IconEditorWindow.py" line="947"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="956"/> + <location filename="../IconEditor/IconEditorWindow.py" line="961"/> <source><p>This part of the status bar displays the icon size.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="963"/> + <location filename="../IconEditor/IconEditorWindow.py" line="968"/> <source><p>This part of the status bar displays the cursor position.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1059"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1064"/> <source>Open icon file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1109"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1114"/> <source>Save icon file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1109"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1114"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1145"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1150"/> <source>The file '{0}' does not exist.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1152"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1157"/> <source>Cannot read file '{0}: {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1186"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1191"/> <source>Cannot write file '{0}: {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1198"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1203"/> <source>Icon saved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1213"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1218"/> <source>Untitled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1217"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1222"/> <source>{0}[*] - {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1217"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1222"/> <source>Icon Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1238"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1243"/> <source>The icon image has unsaved changes.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../IconEditor/IconEditorWindow.py" line="135"/> + <source>JPEG File (*.jpeg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="144"/> + <source>Compressed Scalable Vector Graphics File (*.svgz)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="148"/> + <source>TIFF File (*.tiff)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="149"/> + <source>WAP Bitmap File (*.wbmp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="1243"/> + <source>eric6 Icon Editor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="1333"/> + <source>About eric6 Icon Editor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="1333"/> + <source>The eric6 Icon Editor is a simple editor component to perform icon drawing tasks.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="295"/> + <source>Close Others</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="299"/> + <source>Close all other icon editor windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="301"/> + <source><b>Close Others</b><p>Closes all other icon editor windows.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="150"/> + <source>WebP Image File (*.webp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="128"/> + <source>Windows Cursor File (*.cur)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="129"/> + <source>DirectDraw-Surface File (*.dds)</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../IconEditor/IconEditorWindow.py" line="131"/> - <source>JPEG File (*.jpeg)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="140"/> - <source>Compressed Scalable Vector Graphics File (*.svgz)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="144"/> - <source>TIFF File (*.tiff)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="145"/> - <source>WAP Bitmap File (*.wbmp)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1238"/> - <source>eric6 Icon Editor</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1328"/> - <source>About eric6 Icon Editor</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1328"/> - <source>The eric6 Icon Editor is a simple editor component to perform icon drawing tasks.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="290"/> - <source>Close Others</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="294"/> - <source>Close all other icon editor windows</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="296"/> - <source><b>Close Others</b><p>Closes all other icon editor windows.</p></source> + <source>Apple Icon File (*.icns)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="133"/> + <source>JPEG2000 File (*.jp2)</source> <translation type="unfinished"></translation> </message> </context> @@ -31048,6 +31048,189 @@ </message> </context> <context> + <name>ImageMarkupDialog</name> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="53"/> + <source>Windows Bitmap File (*.bmp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="54"/> + <source>Windows Cursor File (*.cur)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="55"/> + <source>DirectDraw-Surface File (*.dds)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="56"/> + <source>Graphic Interchange Format File (*.gif)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="57"/> + <source>Apple Icon File (*.icns)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="58"/> + <source>Windows Icon File (*.ico)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="59"/> + <source>JPEG2000 File (*.jp2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="60"/> + <source>JPEG File (*.jpg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="61"/> + <source>JPEG File (*.jpeg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="62"/> + <source>Multiple-Image Network Graphics File (*.mng)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="63"/> + <source>Portable Bitmap File (*.pbm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="64"/> + <source>Paintbrush Bitmap File (*.pcx)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="65"/> + <source>Portable Graymap File (*.pgm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="66"/> + <source>Portable Network Graphics File (*.png)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="67"/> + <source>Portable Pixmap File (*.ppm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="68"/> + <source>Silicon Graphics Image File (*.sgi)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="69"/> + <source>Scalable Vector Graphics File (*.svg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="70"/> + <source>Compressed Scalable Vector Graphics File (*.svgz)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="72"/> + <source>Targa Graphic File (*.tga)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="73"/> + <source>TIFF File (*.tif)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="74"/> + <source>TIFF File (*.tiff)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="75"/> + <source>WAP Bitmap File (*.wbmp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="76"/> + <source>WebP Image File (*.webp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="77"/> + <source>X11 Bitmap File (*.xbm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="78"/> + <source>X11 Pixmap File (*.xpm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="89"/> + <source>All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="14"/> + <source>Add Image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="25"/> + <source>Image Address:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="41"/> + <source>Enter the image path or URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="48"/> + <source>Title:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="58"/> + <source>Alternative Text:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="73"/> + <source>Keep Original Size</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="80"/> + <source>Keep Aspect Ratio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="89"/> + <source>Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="119"/> + <source> px</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="109"/> + <source>Height:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ImagesIcon</name> <message> <location filename="../WebBrowser/StatusBar/ImagesIcon.py" line="40"/> @@ -33912,7 +34095,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/LexerAssociationDialog.py" line="131"/> + <location filename="../Project/LexerAssociationDialog.py" line="134"/> <source>Alternative</source> <translation type="unfinished"></translation> </message> @@ -34258,490 +34441,510 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="115"/> + <location filename="../QScintilla/Lexers/__init__.py" line="119"/> <source>Pascal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="117"/> - <source>Perl</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="119"/> - <source>PostScript</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="121"/> - <source>Povray</source> + <source>Perl</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="123"/> + <source>PostScript</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="125"/> + <source>Povray</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="127"/> <source>Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="131"/> - <source>Ruby</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="133"/> - <source>SQL</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="135"/> - <source>TCL</source> + <source>Ruby</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="137"/> - <source>TeX</source> + <source>SQL</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="139"/> - <source>VHDL</source> + <source>TCL</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="141"/> - <source>XML</source> + <source>TeX</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="143"/> + <source>VHDL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="145"/> + <source>XML</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="147"/> <source>YAML</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="171"/> + <location filename="../QScintilla/Lexers/__init__.py" line="175"/> <source>Pygments</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="365"/> + <location filename="../QScintilla/Lexers/__init__.py" line="375"/> <source>Python Files (*.py *.py2 *.py3)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="368"/> + <location filename="../QScintilla/Lexers/__init__.py" line="378"/> <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="547"/> + <location filename="../QScintilla/Lexers/__init__.py" line="565"/> <source>Pyrex Files (*.pyx)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="550"/> + <location filename="../QScintilla/Lexers/__init__.py" line="568"/> <source>Quixote Template Files (*.ptl)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="553"/> + <location filename="../QScintilla/Lexers/__init__.py" line="571"/> <source>Ruby Files (*.rb)</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../QScintilla/Lexers/__init__.py" line="574"/> + <source>IDL Files (*.idl)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="393"/> + <source>C Files (*.h *.c)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="396"/> + <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="586"/> + <source>C# Files (*.cs)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="402"/> + <source>HTML Files (*.html *.htm *.asp *.shtml)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="598"/> + <source>CSS Files (*.css)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="601"/> + <source>QSS Files (*.qss)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="411"/> + <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="414"/> + <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="613"/> + <source>Qt Resource Files (*.qrc)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="420"/> + <source>D Files (*.d *.di)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="622"/> + <source>Java Files (*.java)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="625"/> + <source>JavaScript Files (*.js)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="628"/> + <source>SQL Files (*.sql)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="631"/> + <source>Docbook Files (*.docbook)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="435"/> + <source>Perl Files (*.pl *.pm *.ph)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="640"/> + <source>Lua Files (*.lua)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="441"/> + <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="643"/> + <source>Shell Files (*.sh)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="447"/> + <source>Batch Files (*.bat *.cmd)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> + <source>Diff Files (*.diff *.patch)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="453"/> + <source>Makefiles (*.mak)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="456"/> + <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="667"/> + <source>Povray Files (*.pov)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="463"/> + <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="466"/> + <source>VHDL Files (*.vhd *.vhdl)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="469"/> + <source>TCL/Tk Files (*.tcl *.tk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="472"/> + <source>Fortran Files (*.f90 *.f95 *.f2k)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="475"/> + <source>Fortran77 Files (*.f *.for)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="478"/> + <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="694"/> + <source>PostScript Files (*.ps)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="484"/> + <source>YAML Files (*.yaml *.yml)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="744"/> + <source>All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../QScintilla/Lexers/__init__.py" line="556"/> - <source>IDL Files (*.idl)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="383"/> - <source>C Files (*.h *.c)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="386"/> - <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="568"/> - <source>C# Files (*.cs)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="392"/> - <source>HTML Files (*.html *.htm *.asp *.shtml)</source> + <source>Python3 Files (*.py)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="562"/> + <source>Python3 GUI Files (*.pyw)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="577"/> + <source>C Files (*.c)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="580"/> - <source>CSS Files (*.css)</source> + <source>C++ Files (*.cpp)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="583"/> - <source>QSS Files (*.qss)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="401"/> - <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="404"/> - <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> + <source>C++/C Header Files (*.h)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="589"/> + <source>HTML Files (*.html)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="592"/> + <source>PHP Files (*.php)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="595"/> - <source>Qt Resource Files (*.qrc)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="410"/> - <source>D Files (*.d *.di)</source> + <source>ASP Files (*.asp)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="604"/> - <source>Java Files (*.java)</source> + <source>XML Files (*.xml)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="607"/> - <source>JavaScript Files (*.js)</source> + <source>XSL Files (*.xsl)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="610"/> - <source>SQL Files (*.sql)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="613"/> - <source>Docbook Files (*.docbook)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="425"/> - <source>Perl Files (*.pl *.pm *.ph)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="622"/> - <source>Lua Files (*.lua)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="431"/> - <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="625"/> - <source>Shell Files (*.sh)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="437"/> - <source>Batch Files (*.bat *.cmd)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="440"/> - <source>Diff Files (*.diff *.patch)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="443"/> - <source>Makefiles (*.mak)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="446"/> - <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> + <source>DTD Files (*.dtd)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="616"/> + <source>D Files (*.d)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="619"/> + <source>D Interface Files (*.di)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="634"/> + <source>Perl Files (*.pl)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="637"/> + <source>Perl Module Files (*.pm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="646"/> + <source>Batch Files (*.bat)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="649"/> - <source>Povray Files (*.pov)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="453"/> - <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="456"/> - <source>VHDL Files (*.vhd *.vhdl)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="459"/> - <source>TCL/Tk Files (*.tcl *.tk)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="462"/> - <source>Fortran Files (*.f90 *.f95 *.f2k)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="465"/> - <source>Fortran77 Files (*.f *.for)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="468"/> - <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> + <source>TeX Files (*.tex)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="652"/> + <source>TeX Template Files (*.sty)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="655"/> + <source>Diff Files (*.diff)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="658"/> + <source>Make Files (*.mak)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="661"/> + <source>Properties Files (*.ini)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="664"/> + <source>Configuration Files (*.cfg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="670"/> + <source>CMake Files (CMakeLists.txt)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="673"/> + <source>CMake Macro Files (*.cmake)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="676"/> - <source>PostScript Files (*.ps)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="474"/> - <source>YAML Files (*.yaml *.yml)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="718"/> - <source>All Files (*)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="538"/> - <source>Python3 Files (*.py)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="544"/> - <source>Python3 GUI Files (*.pyw)</source> + <source>VHDL Files (*.vhd)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="679"/> + <source>TCL Files (*.tcl)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="682"/> + <source>Tk Files (*.tk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="685"/> + <source>Fortran Files (*.f95)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="688"/> + <source>Fortran77 Files (*.f)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="691"/> + <source>Pascal Files (*.pas)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="697"/> + <source>YAML Files (*.yml)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="553"/> + <source>Python2 Files (*.py2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="559"/> - <source>C Files (*.c)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="562"/> - <source>C++ Files (*.cpp)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="565"/> - <source>C++/C Header Files (*.h)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="571"/> - <source>HTML Files (*.html)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="574"/> - <source>PHP Files (*.php)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="577"/> - <source>ASP Files (*.asp)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="586"/> - <source>XML Files (*.xml)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="589"/> - <source>XSL Files (*.xsl)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="592"/> - <source>DTD Files (*.dtd)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="598"/> - <source>D Files (*.d)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="601"/> - <source>D Interface Files (*.di)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="616"/> - <source>Perl Files (*.pl)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="619"/> - <source>Perl Module Files (*.pm)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="628"/> - <source>Batch Files (*.bat)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="631"/> - <source>TeX Files (*.tex)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="634"/> - <source>TeX Template Files (*.sty)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="637"/> - <source>Diff Files (*.diff)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="640"/> - <source>Make Files (*.mak)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="643"/> - <source>Properties Files (*.ini)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="646"/> - <source>Configuration Files (*.cfg)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="652"/> - <source>CMake Files (CMakeLists.txt)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="655"/> - <source>CMake Macro Files (*.cmake)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="658"/> - <source>VHDL Files (*.vhd)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="661"/> - <source>TCL Files (*.tcl)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="664"/> - <source>Tk Files (*.tk)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="667"/> - <source>Fortran Files (*.f95)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="670"/> - <source>Fortran77 Files (*.f)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="673"/> - <source>Pascal Files (*.pas)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="679"/> - <source>YAML Files (*.yml)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="535"/> - <source>Python2 Files (*.py2)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="541"/> <source>Python2 GUI Files (*.pyw2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="125"/> - <source>Python2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="127"/> - <source>Python3</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="148"/> - <source>Matlab</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="148"/> - <source>Octave</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="480"/> - <source>Matlab Files (*.m *.m.matlab)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="685"/> - <source>Matlab Files (*.m)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="685"/> - <source>Octave Files (*.m.octave)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="480"/> - <source>Octave Files (*.m *.m.octave)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="129"/> + <source>Python2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="131"/> + <source>Python3</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="115"/> + <source>Matlab</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="117"/> + <source>Octave</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="487"/> + <source>Matlab Files (*.m *.m.matlab)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="700"/> + <source>Matlab Files (*.m)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="703"/> + <source>Octave Files (*.m.octave)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="490"/> + <source>Octave Files (*.m *.m.octave)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="133"/> <source>QSS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="157"/> + <location filename="../QScintilla/Lexers/__init__.py" line="153"/> <source>Gettext</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="695"/> + <location filename="../QScintilla/Lexers/__init__.py" line="709"/> <source>Gettext Files (*.po)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="162"/> + <location filename="../QScintilla/Lexers/__init__.py" line="158"/> <source>CoffeeScript</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="702"/> + <location filename="../QScintilla/Lexers/__init__.py" line="716"/> <source>CoffeeScript Files (*.coffee)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="163"/> + <source>JSON</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="723"/> + <source>JSON Files (*.json)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="166"/> + <source>Markdown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="728"/> + <source>Markdown Files (*.md)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>LfConvertDataDialog</name> @@ -34954,6 +35157,19 @@ </message> </context> <context> + <name>MarkdownProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/MarkdownProvider.py" line="383"/> + <source>Create List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/MarkdownProvider.py" line="383"/> + <source>Enter desired number of list elements:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>MasterPasswordEntryDialog</name> <message> <location filename="../Preferences/ConfigurationPages/MasterPasswordEntryDialog.ui" line="14"/> @@ -35029,12 +35245,12 @@ <context> <name>McCabeChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="423"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="426"/> <source>'{0}' is too complex ({1})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="425"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="428"/> <source>{0}: {1}</source> <translation type="unfinished"></translation> </message> @@ -35062,124 +35278,109 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="155"/> <source>Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="161"/> <source>No. of commit messages to remember:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="168"/> <source>Enter the number of commit messages to remember</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="216"/> - <source>Incoming / Outgoing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="222"/> - <source>Select to show the incoming and outgoing log in a log browser dialog</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="225"/> - <source>Use Log Browser for incoming / outgoing log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="235"/> - <source>Pull</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="242"/> <source>Select to update the working directory to new tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="236"/> + <source>Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="245"/> <source>Update after pulling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="334"/> <source>Edit the Mercurial configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="337"/> <source>Edit configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="311"/> <source>Cleanup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="317"/> <source>Pattern:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="324"/> <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="252"/> <source>Select to prefer unbundle over pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="255"/> <source><b>Prefer Unbundle</b> <p>If this option is selected, it will be checked, if a Mercurial changegroups file from a previous "Show Incoming" request exists. In this case it will be applied and deleted. Otherwise a pull request will be sent.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="259"/> <source>Prefer Unbundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="292"/> <source>Revert</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="298"/> <source>Select to create a backup file (.orig) before reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="301"/> <source>Create Backup Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="269"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="275"/> <source>Select to enforce usage of the Mercural internal merge tool</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="278"/> <source><b>Internal Merge Tool</b> <p>Select to enforce usage of the Mercural internal merge tool,which leaves conflict markers in the file in case of conflicting changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="282"/> <source>Use internal merge with conflict markers</source> <translation type="unfinished"></translation> </message> @@ -35214,15 +35415,25 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="197"/> <source>No. of commit authors to remember:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="204"/> <source>Enter the number of commit authors to remember</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="132"/> + <source>No. of message characters shown in list:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="139"/> + <source>Enter the number of characters of the commit message to be shown in the list</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -36181,107 +36392,107 @@ <context> <name>MiscellaneousChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="429"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="432"/> <source>coding magic comment not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="432"/> - <source>unknown encoding ({0}) found in coding magic comment</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="435"/> - <source>copyright notice not present</source> + <source>unknown encoding ({0}) found in coding magic comment</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="438"/> - <source>copyright notice contains invalid author</source> + <source>copyright notice not present</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="441"/> - <source>blind except: statement</source> + <source>copyright notice contains invalid author</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="444"/> - <source>found {0} formatter</source> + <source>blind except: statement</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="447"/> - <source>format string does contain unindexed parameters</source> + <source>found {0} formatter</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="450"/> - <source>docstring does contain unindexed parameters</source> + <source>format string does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="453"/> - <source>other string does contain unindexed parameters</source> + <source>docstring does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="456"/> - <source>format call uses too large index ({0})</source> + <source>other string does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="459"/> - <source>format call uses missing keyword ({0})</source> + <source>format call uses too large index ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="462"/> - <source>format call uses keyword arguments but no named entries</source> + <source>format call uses missing keyword ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="465"/> - <source>format call uses variable arguments but no numbered entries</source> + <source>format call uses keyword arguments but no named entries</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="468"/> - <source>format call uses implicit and explicit indexes together</source> + <source>format call uses variable arguments but no numbered entries</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="471"/> - <source>format call provides unused index ({0})</source> + <source>format call uses implicit and explicit indexes together</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="474"/> - <source>format call provides unused keyword ({0})</source> + <source>format call provides unused index ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="477"/> - <source>expected these __future__ imports: {0}; but only got: {1}</source> + <source>format call provides unused keyword ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="480"/> - <source>expected these __future__ imports: {0}; but got none</source> + <source>expected these __future__ imports: {0}; but only got: {1}</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="483"/> - <source>print statement found</source> + <source>expected these __future__ imports: {0}; but got none</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="486"/> - <source>one element tuple found</source> + <source>print statement found</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="489"/> + <source>one element tuple found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="492"/> <source>{0}: {1}</source> <translation type="unfinished"></translation> </message> @@ -36674,72 +36885,72 @@ <context> <name>NamingStyleChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="378"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> <source>class names should use CapWords convention</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> - <source>function name should be lowercase</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="384"/> - <source>argument name should be lowercase</source> + <source>function name should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="387"/> - <source>first argument of a class method should be named 'cls'</source> + <source>argument name should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="390"/> - <source>first argument of a method should be named 'self'</source> + <source>first argument of a class method should be named 'cls'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="393"/> + <source>first argument of a method should be named 'self'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="396"/> <source>first argument of a static method should not be named 'self' or 'cls</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="397"/> - <source>module names should be lowercase</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="400"/> - <source>package names should be lowercase</source> + <source>module names should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="403"/> - <source>constant imported as non constant</source> + <source>package names should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="406"/> - <source>lowercase imported as non lowercase</source> + <source>constant imported as non constant</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="409"/> - <source>camelcase imported as lowercase</source> + <source>lowercase imported as non lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="412"/> - <source>camelcase imported as constant</source> + <source>camelcase imported as lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="415"/> - <source>variable in function should be lowercase</source> + <source>camelcase imported as constant</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="418"/> + <source>variable in function should be lowercase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="421"/> <source>names 'l', 'O' and 'I' should be avoided</source> <translation type="unfinished"></translation> </message> @@ -39111,27 +39322,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1525"/> + <location filename="../Preferences/__init__.py" line="1530"/> <source>Export Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1553"/> + <location filename="../Preferences/__init__.py" line="1558"/> <source>Import Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1553"/> + <location filename="../Preferences/__init__.py" line="1558"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1655"/> + <location filename="../Preferences/__init__.py" line="1660"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1655"/> + <location filename="../Preferences/__init__.py" line="1660"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -39157,7 +39368,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="572"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="565"/> <source><p>ReStructuredText preview requires the <b>python-docutils</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pypi.python.org/pypi/docutils">this page.</a></p></source> <translation type="unfinished"></translation> </message> @@ -39167,8 +39378,8 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="597"/> - <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> + <location filename="../UI/Previewers/PreviewerHTML.py" line="590"/> + <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> <translation type="unfinished"></translation> </message> </context> @@ -39195,17 +39406,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="177"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="179"/> <source><p>No preview available for this type of file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="225"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="230"/> <source>Preview - {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="227"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="232"/> <source>Preview</source> <translation type="unfinished"></translation> </message> @@ -43698,521 +43909,501 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/> - <source>Show log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/> - <source>Show &log</source> + <source>Show log browser</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> - <source>Show the log of the local project</source> + <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="107"/> - <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="114"/> - <source>Show log browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="119"/> - <source>Show a dialog to browse the log of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/> <source>Show &difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="132"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="137"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="140"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/> <source>Show differences (URLs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="153"/> <source>Show the difference of the project between two repository URLs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="156"/> <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/> + <source>Show status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/> + <source>Show &status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> + <source>Show the status of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="172"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> - <source>Show status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> - <source>Show &status</source> + <source>Show change lists</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/> - <source>Show the status of the local project</source> + <source>Show the change lists and associated files of the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="187"/> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> - <source>Show change lists</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="199"/> - <source>Show the change lists and associated files of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="202"/> <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> <source>Show repository info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="215"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="200"/> <source>Show some repository related information for the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="203"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source>Tag in repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source>&Tag in repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="216"/> + <source>Tag the local project in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> - <source>Tag in repository</source> + <source>Export from repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> - <source>&Tag in repository...</source> + <source>&Export from repository...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="231"/> - <source>Tag the local project in the repository</source> + <source>Export a project from the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> - <source>Export from repository</source> + <source>Command options</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> - <source>&Export from repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="246"/> - <source>Export a project from the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/> - <source>Command options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/> <source>Command &options...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Show the VCS command options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/> + <source>Re&vert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <source>Revert all changes made to the local project</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/> - <source>Revert changes</source> + <source>Merge</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/> - <source>Re&vert changes</source> + <source>Mer&ge changes...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> - <source>Revert all changes made to the local project</source> + <source>Merge changes of a tag/revision into the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/> - <source>Merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/> - <source>Mer&ge changes...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="289"/> - <source>Merge changes of a tag/revision into the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/> + <source>S&witch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <source>Switch the local copy to another tag/branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>Switch</source> + <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>S&witch...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> - <source>Switch the local copy to another tag/branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> - <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="304"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="307"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> - <source>Conflicts resolved</source> + <source>Cleanup</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> - <source>Con&flicts resolved</source> + <source>Cleanu&p</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> - <source>Mark all conflicts of the local project as resolved</source> + <source>Cleanup the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="322"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/> - <source>Cleanup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/> - <source>Cleanu&p</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> - <source>Cleanup the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="337"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>Execute command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>E&xecute command...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="333"/> <source>Execute an arbitrary VCS command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="336"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/> <source>List tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/> <source>List tags...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="350"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="361"/> <source>List branches of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="364"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source>List repository contents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source>List repository contents...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="375"/> <source>Lists the contents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/> <source>Set Property</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/> <source>Set Property...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="389"/> <source>Set a property for the project files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="392"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source>List Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source>List Properties...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="403"/> <source>List properties of the project files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/> <source>Delete Property</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/> <source>Delete Property...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> + <source>Delete a property for the project files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="420"/> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/> + <source>Relocate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/> + <source>Relocate...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> - <source>Delete a property for the project files</source> + <source>Relocate the working copy to a new repository URL</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/> - <source>Relocate</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/> - <source>Relocate...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> - <source>Relocate the working copy to a new repository URL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/> + <source>Repository Browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/> + <source>Repository Browser...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> + <source>Show the Repository Browser dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> - <source>Repository Browser</source> + <source>Configure</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> - <source>Repository Browser...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="463"/> - <source>Show the Repository Browser dialog</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="466"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <source>Configure...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="462"/> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="465"/> + <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/> - <source>Configure</source> + <source>Upgrade</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/> - <source>Configure...</source> + <source>Upgrade...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="477"/> - <source>Show the configuration dialog with the Subversion page selected</source> + <source>Upgrade the working copy to the current format</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="480"/> - <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/> - <source>Upgrade</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/> - <source>Upgrade...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="492"/> - <source>Upgrade the working copy to the current format</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="495"/> <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="559"/> <source>Subversion (pysvn)</source> <translation type="unfinished"></translation> </message> @@ -47196,17 +47387,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="55"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="65"/> <source>Press to remove the selected documents from the database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="58"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="68"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="117"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="132"/> <source>Add Documentation</source> <translation type="unfinished"></translation> </message> @@ -47216,40 +47407,50 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="107"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="122"/> <source>The file <b>{0}</b> is not a valid Qt Help File.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="117"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="132"/> <source>The namespace <b>{0}</b> is already registered.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="167"/> + <source>Remove Documentation</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="152"/> - <source>Remove Documentation</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="137"/> <source>Do you really want to remove the selected documentation sets from the database?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="152"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="167"/> <source>Some documents currently opened reference the documentation you are attempting to remove. Removing the documentation will close those documents. Remove anyway?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="78"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="55"/> <source>Press to select QtHelp documents provided by a plug-in to add to the database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="81"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="58"/> <source>Add from Plug-ins...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="85"/> + <source>Select to manage the plug-in provided documentation sets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="88"/> + <source>Manage Plug-ins...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QtHelpDocumentationSelectionDialog</name> @@ -47263,6 +47464,61 @@ <source>Select the documentation files to be installed:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="144"/> + <source>Delete Documentation Sets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="91"/> + <source>Shall the selected documentation sets really be deleted?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="107"/> + <source><p>The documentation set <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="126"/> + <source>Shall the selected documentation set categories really be deleted?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="144"/> + <source>Shall all documentation sets really be deleted?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="56"/> + <source>Press to delete the selected documentation sets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="59"/> + <source>Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="66"/> + <source>Press to delete the selected category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="69"/> + <source>Delete Categories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="76"/> + <source>Press to delete all entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="79"/> + <source>Delete All</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QtHelpFiltersDialog</name> @@ -48530,6 +48786,19 @@ </message> </context> <context> + <name>RestructuredTextProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/RestructuredTextProvider.py" line="411"/> + <source>Create List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/RestructuredTextProvider.py" line="411"/> + <source>Enter desired number of list elements:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>SafariImporter</name> <message> <location filename="../WebBrowser/Bookmarks/BookmarksImporters/SafariImporter.py" line="44"/> @@ -51534,7 +51803,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1984"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1964"/> <source>The svn process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -51624,137 +51893,127 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/> <source>Subversion Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="951"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="998"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="978"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1033"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1013"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1056"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1093"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1073"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1151"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1131"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1196"/> <source>Merging {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1482"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1462"/> <source>Cleaning up {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1512"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1492"/> <source>Subversion command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1684"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1664"/> <source>Resolving conficts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1695"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1779"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1759"/> <source>Subversion Set Property</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1781"/> + <source>You have to supply a property name. Aborting.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1801"/> - <source>You have to supply a property name. Aborting.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1821"/> <source>Subversion Delete Property</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1791"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1771"/> <source>Enter property name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> - <source>Subversion Log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> - <source>Select number of entries to show.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2080"/> <source>Locking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2108"/> <source>Unlocking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2153"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2133"/> <source>Relocating</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/> <source>Repository Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/> <source>Enter the repository URL.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2221"/> <source>Remove from changelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/> <source>Add to changelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/> <source>Enter name of the changelist:</source> <translation type="unfinished"></translation> </message> @@ -51770,28 +52029,28 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1255"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1234"/> <source>Revision {0}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1923"/> <source>Property set.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1997"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1976"/> <source>Property deleted.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/> <source>Subversion Lock</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/> <source>Enter lock comment</source> <translation type="unfinished"></translation> </message> @@ -51971,37 +52230,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1042"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1987"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1967"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/> <source>Subversion Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2305"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2285"/> <source>Upgrade</source> <translation type="unfinished"></translation> </message> @@ -52857,17 +53116,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="661"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="658"/> <source>Author</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="165"/> <source>Message</source> <translation type="unfinished"></translation> </message> @@ -52927,255 +53186,130 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="261"/> <source>Press to generate a diff to the previous revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="264"/> <source>&Diff to Previous</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="271"/> <source>Press to compare two revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="254"/> - <source>&Compare Revisions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="292"/> - <source>Errors</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="298"/> - <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="314"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="336"/> - <source>Press to send the input to the subversion process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="349"/> - <source>Enter data to be sent to the subversion process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="89"/> - <source>Added</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="90"/> - <source>Deleted</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="91"/> - <source>Modified</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="504"/> - <source>Subversion Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="92"/> - <source>Replaced</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> - <source>Select to show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="277"/> - <source>Show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>SvnLogDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="14"/> - <source>Subversion Log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="26"/> - <source>Log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="32"/> - <source><b>Subversion Log</b><p>This shows the output of the svn log command. By clicking on the links you may show the difference between versions.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="58"/> + <source>&Compare Revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="312"/> <source>Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="64"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="318"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="80"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="334"/> <source>Input</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> <source>Press to send the input to the subversion process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> <source>&Send</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="108"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> <source>Alt+S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="369"/> <source>Enter data to be sent to the subversion process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="122"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="376"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="379"/> <source>&Password Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="382"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="55"/> - <source><b>Processing your request, please wait...</b></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="81"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="93"/> <source>Added</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="82"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="94"/> <source>Deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="83"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="95"/> <source>Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="87"/> - <source>revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="527"/> + <source>Subversion Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="313"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="313"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="193"/> - <source>diff to {0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="202"/> - <source><i>author: {0}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="205"/> - <source><i>date: {0}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="191"/> - <source> (copied from {0}, revision {1})</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="42"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="96"/> + <source>Replaced</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="294"/> <source>Select to show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="297"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnLoginDialog</name> @@ -53455,177 +53589,172 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="634"/> <source>Version Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="654"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="646"/> <source>Update from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="658"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="650"/> <source>Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="656"/> <source>Add to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="385"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="381"/> <source>Add tree to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="660"/> <source>Remove from repository (and disk)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="667"/> <source>Add to Changelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="679"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="671"/> <source>Remove from Changelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="566"/> - <source>Show log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="562"/> <source>Show log browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="684"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="676"/> <source>Show status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="286"/> <source>Show annotated file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="696"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="708"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="700"/> <source>Merge changes</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="430"/> + <source>Lock</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="434"/> - <source>Lock</source> + <source>Unlock</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="438"/> - <source>Unlock</source> + <source>Break Lock</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="442"/> - <source>Break Lock</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="446"/> <source>Steal Lock</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="708"/> + <source>Set Property</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="710"/> + <source>List Properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="713"/> + <source>Delete Property</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="716"/> - <source>Set Property</source> + <source>Select all local file entries</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="718"/> - <source>List Properties</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="721"/> - <source>Delete Property</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="724"/> - <source>Select all local file entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="726"/> <source>Select all versioned file entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="720"/> <source>Select all local directory entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="730"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="722"/> <source>Select all versioned directory entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="733"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="725"/> <source>Configure...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="572"/> <source>Show repository info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="547"/> <source>Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="549"/> <source>Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="681"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="271"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="267"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="693"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="685"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="276"/> <source>Show differences side-by-side (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="698"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="690"/> <source>Show differences (URLs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="712"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> @@ -53694,506 +53823,486 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/> - <source>Show log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/> - <source>Show &log</source> + <source>Show log browser</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="104"/> - <source>Show the log of the local project</source> + <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="107"/> - <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="114"/> - <source>Show log browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="119"/> - <source>Show a dialog to browse the log of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="122"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/> <source>Show &difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="121"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="137"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="153"/> <source>Show the difference of the project between two repository URLs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="164"/> <source>Show status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="164"/> <source>Show &status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="169"/> <source>Show the status of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="172"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="195"/> + <source>Tag in repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="195"/> + <source>&Tag in repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="200"/> + <source>Tag the local project in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="203"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="210"/> - <source>Tag in repository</source> + <source>Export from repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="210"/> - <source>&Tag in repository...</source> + <source>&Export from repository...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="215"/> - <source>Tag the local project in the repository</source> + <source>Export a project from the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="218"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/> - <source>Export from repository</source> + <source>Command options</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/> - <source>&Export from repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="230"/> - <source>Export a project from the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="233"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="240"/> - <source>Command options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="240"/> <source>Command &options...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="229"/> <source>Show the VCS command options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="231"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="238"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="238"/> + <source>Re&vert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="243"/> + <source>Revert all changes made to the local project</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="246"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/> - <source>Revert changes</source> + <source>Merge</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/> - <source>Re&vert changes</source> + <source>Mer&ge changes...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="258"/> - <source>Revert all changes made to the local project</source> + <source>Merge changes of a tag/revision into the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="261"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="268"/> - <source>Merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="268"/> - <source>Mer&ge changes...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="273"/> - <source>Merge changes of a tag/revision into the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="276"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="269"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="269"/> + <source>S&witch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="274"/> + <source>Switch the local copy to another tag/branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="277"/> + <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> + <source>Cleanup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> + <source>Cleanu&p</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="303"/> + <source>Cleanup the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="306"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="313"/> + <source>Execute command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="313"/> + <source>E&xecute command...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="317"/> + <source>Execute an arbitrary VCS command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="320"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="327"/> + <source>List tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="327"/> + <source>List tags...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="331"/> + <source>List tags of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="334"/> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="341"/> + <source>List branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="341"/> + <source>List branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="345"/> + <source>List branches of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="348"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="355"/> + <source>List repository contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="355"/> + <source>List repository contents...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="359"/> + <source>Lists the contents of the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="362"/> + <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="369"/> + <source>Set Property</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="369"/> + <source>Set Property...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="373"/> + <source>Set a property for the project files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="376"/> + <source><b>Set Property</b><p>This sets a property for the project files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="383"/> + <source>List Properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="383"/> + <source>List Properties...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="387"/> + <source>List properties of the project files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="390"/> + <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="397"/> + <source>Delete Property</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="397"/> + <source>Delete Property...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="401"/> + <source>Delete a property for the project files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="404"/> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/> + <source>Relocate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/> + <source>Relocate...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="416"/> + <source>Relocate the working copy to a new repository URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="419"/> + <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="427"/> + <source>Repository Browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="427"/> + <source>Repository Browser...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="432"/> + <source>Show the Repository Browser dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="435"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> + <source>Configure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> + <source>Configure...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="446"/> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="449"/> + <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> - <source>S&witch...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="289"/> - <source>Switch the local copy to another tag/branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="292"/> - <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="314"/> - <source>Cleanup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="314"/> - <source>Cleanu&p</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="318"/> - <source>Cleanup the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="321"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="328"/> - <source>Execute command</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="328"/> - <source>E&xecute command...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="332"/> - <source>Execute an arbitrary VCS command</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="335"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="342"/> - <source>List tags</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="342"/> - <source>List tags...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="346"/> - <source>List tags of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="349"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="356"/> - <source>List branches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="356"/> - <source>List branches...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="360"/> - <source>List branches of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="363"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="370"/> - <source>List repository contents</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="370"/> - <source>List repository contents...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="374"/> - <source>Lists the contents of the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="377"/> - <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="384"/> - <source>Set Property</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="384"/> - <source>Set Property...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="388"/> - <source>Set a property for the project files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="391"/> - <source><b>Set Property</b><p>This sets a property for the project files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="398"/> - <source>List Properties</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="398"/> - <source>List Properties...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="402"/> - <source>List properties of the project files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="405"/> - <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="412"/> - <source>Delete Property</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="412"/> - <source>Delete Property...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="416"/> - <source>Delete a property for the project files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="419"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="426"/> - <source>Relocate</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="426"/> - <source>Relocate...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="431"/> - <source>Relocate the working copy to a new repository URL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="434"/> - <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> - <source>Repository Browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> - <source>Repository Browser...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="447"/> - <source>Show the Repository Browser dialog</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="450"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="288"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="291"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <source>Show change lists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="184"/> + <source>Show the change lists and associated files of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="187"/> + <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> + <source>Upgrade</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> - <source>Configure</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> - <source>Configure...</source> + <source>Upgrade...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="461"/> - <source>Show the configuration dialog with the Subversion page selected</source> + <source>Upgrade the working copy to the current format</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="464"/> - <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="303"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="306"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="194"/> - <source>Show change lists</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="199"/> - <source>Show the change lists and associated files of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="202"/> - <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="472"/> - <source>Upgrade</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="472"/> - <source>Upgrade...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="476"/> - <source>Upgrade the working copy to the current format</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="479"/> <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="132"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="148"/> <source>Show differences (URLs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="124"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="140"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="156"/> <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="559"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="543"/> <source>Subversion (svn)</source> <translation type="unfinished"></translation> </message> @@ -58444,22 +58553,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="66"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="62"/> <source>Language:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="70"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="69"/> <source>GROUP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="103"/> <source>Close dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="103"/> <source>Do you really want to close the dialog?</source> <translation type="unfinished"></translation> </message> @@ -60074,7 +60183,7 @@ <context> <name>UnittestDialog</name> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.py" line="403"/> <source>Unittest</source> <translation type="unfinished"></translation> </message> @@ -60255,57 +60364,57 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="202"/> + <location filename="../PyUnit/UnittestDialog.py" line="205"/> <source>Python3 Files ({1});;Python2 Files ({0});;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="206"/> + <location filename="../PyUnit/UnittestDialog.py" line="209"/> <source>Python Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="266"/> + <location filename="../PyUnit/UnittestDialog.py" line="269"/> <source>You must enter a test suite file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="274"/> + <location filename="../PyUnit/UnittestDialog.py" line="277"/> <source>Preparing Testsuite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.py" line="403"/> <source><p>Unable to run test <b>{0}</b>.<br>{1}<br>{2}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="469"/> + <location filename="../PyUnit/UnittestDialog.py" line="475"/> <source>Running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="493"/> + <location filename="../PyUnit/UnittestDialog.py" line="499"/> <source>Ran {0} test in {1:.3f}s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="497"/> + <location filename="../PyUnit/UnittestDialog.py" line="503"/> <source>Ran {0} tests in {1:.3f}s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="514"/> + <location filename="../PyUnit/UnittestDialog.py" line="520"/> <source>Failure: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="529"/> + <location filename="../PyUnit/UnittestDialog.py" line="535"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="634"/> + <location filename="../PyUnit/UnittestDialog.py" line="640"/> <source>Show Source</source> <translation type="unfinished"></translation> </message> @@ -60340,17 +60449,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="544"/> + <location filename="../PyUnit/UnittestDialog.py" line="550"/> <source> Skipped: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="559"/> + <location filename="../PyUnit/UnittestDialog.py" line="565"/> <source> Expected Failure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="573"/> + <location filename="../PyUnit/UnittestDialog.py" line="579"/> <source> Unexpected Success</source> <translation type="unfinished"></translation> </message> @@ -62723,7 +62832,7 @@ <context> <name>Utilities</name> <message> - <location filename="../Utilities/__init__.py" line="1400"/> + <location filename="../Utilities/__init__.py" line="1403"/> <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> @@ -62942,12 +63051,12 @@ </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="38"/> - <source>&Locals Filter</source> + <source>&Locals Viewer</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="48"/> - <source>&Globals Filter</source> + <source>&Globals Viewer</source> <translation type="unfinished"></translation> </message> <message> @@ -62958,7 +63067,7 @@ <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="61"/> <source><b>Locals Filter List</b> -<p>Select the variable types you want to be filtered out of the locals variables list.</p<</source> +<p>Select the variable types you want to be shown in the local variables viewer.</p<</source> <translation type="unfinished"></translation> </message> <message> @@ -62969,7 +63078,7 @@ <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="81"/> <source><b>Globals Filter List</b> -<p>Select the variable types you want to be filtered out of the globals variables list.</p<</source> +<p>Select the variable types you want to be shown in the global variables viewer.</p<</source> <translation type="unfinished"></translation> </message> <message> @@ -62977,6 +63086,11 @@ <source>Save Default</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Debugger/VariablesFilterDialog.ui" line="28"/> + <source>Select the variable types to be shown in the variables viewers:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VariablesViewer</name> @@ -63539,7 +63653,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="532"/> + <location filename="../VCS/ProjectHelper.py" line="533"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -63554,7 +63668,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="532"/> + <location filename="../VCS/ProjectHelper.py" line="533"/> <source>Switch</source> <translation type="unfinished"></translation> </message> @@ -63634,17 +63748,17 @@ <context> <name>VersionControl</name> <message> - <location filename="../VCS/VersionControl.py" line="573"/> + <location filename="../VCS/VersionControl.py" line="563"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VCS/VersionControl.py" line="573"/> + <location filename="../VCS/VersionControl.py" line="563"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../VCS/VersionControl.py" line="704"/> + <location filename="../VCS/VersionControl.py" line="694"/> <source>Repository status checking is switched off</source> <translation type="unfinished"></translation> </message> @@ -70865,46 +70979,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1459"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1426"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1446"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -70912,12 +71026,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -70928,13 +71042,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2078"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2083"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> @@ -71441,50 +71555,55 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="240"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="243"/> <source>do not assign a lambda expression, use a def</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="243"/> - <source>ambiguous variable name '{0}'</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="246"/> - <source>ambiguous class definition '{0}'</source> + <source>ambiguous variable name '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="249"/> - <source>ambiguous function definition '{0}'</source> + <source>ambiguous class definition '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="252"/> - <source>{0}: {1}</source> + <source>ambiguous function definition '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="255"/> + <source>{0}: {1}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="258"/> <source>{0}</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="240"/> + <source>do not use bare except</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>subversion</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1606"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1586"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1741"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1720"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1746"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1725"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation type="unfinished"></translation> </message>
diff -r 852016bbdedb -r c307358a2ecc i18n/eric6_es.ts --- a/i18n/eric6_es.ts Fri Jan 27 19:18:52 2017 +0100 +++ b/i18n/eric6_es.ts Fri Feb 03 19:20:59 2017 +0100 @@ -390,7 +390,7 @@ <context> <name>AddBookmarkDialog</name> <message> - <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="198"/> + <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.ui" line="26"/> <source>Add Bookmark</source> <translation>Añadir Marcador</translation> </message> @@ -1724,7 +1724,7 @@ <translation>Editar &Dirección</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/> <source>&Delete</source> <translation>&Borrar</translation> </message> @@ -2421,12 +2421,12 @@ <translation>Pulsar para guardar el trazado de llamadas como archivo de texto</translation> </message> <message> - <location filename="../Debugger/CallTraceViewer.py" line="54"/> + <location filename="../Debugger/CallTraceViewer.ui" line="109"/> <source>From</source> <translation>Desde</translation> </message> <message> - <location filename="../Debugger/CallTraceViewer.py" line="54"/> + <location filename="../Debugger/CallTraceViewer.ui" line="114"/> <source>To</source> <translation>Hasta</translation> </message> @@ -2592,7 +2592,7 @@ <translation>Pulsar para cancelar la edición compartida</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="513"/> + <location filename="../Cooperation/ChatWidget.ui" line="230"/> <source>Clear</source> <translation>Limpiar</translation> </message> @@ -2892,7 +2892,7 @@ <context> <name>ClickToFlashWhitelistDialog</name> <message> - <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="54"/> + <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="14"/> <source>ClickToFlash Whitelist</source> <translation>Lista Blanca de ClickToFlash</translation> </message> @@ -3517,147 +3517,147 @@ <context> <name>CodeStyleFixer</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="494"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> <source>Triple single quotes converted to triple double quotes.</source> <translation>Triple comilla simple convertida a triple comilla doble.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> - <source>Introductory quotes corrected to be {0}"""</source> - <translation>Comillas introductorias corregidas para ser {0}"""</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="500"/> - <source>Single line docstring put on one line.</source> - <translation>Docstrings de una sola línea puestos en una sola línea.</translation> + <source>Introductory quotes corrected to be {0}"""</source> + <translation>Comillas introductorias corregidas para ser {0}"""</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="503"/> + <source>Single line docstring put on one line.</source> + <translation>Docstrings de una sola línea puestos en una sola línea.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="506"/> <source>Period added to summary line.</source> <translation>Coma añadida a la línea de resumen.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> <source>Blank line before function/method docstring removed.</source> <translation>Línea en blanco antes de docstring de función/método eliminada.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="509"/> - <source>Blank line inserted before class docstring.</source> - <translation>Linea en blanco insertada delante de docstring de clase.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="512"/> - <source>Blank line inserted after class docstring.</source> - <translation>Linea en blanco insertada detrás de docstring.</translation> + <source>Blank line inserted before class docstring.</source> + <translation>Linea en blanco insertada delante de docstring de clase.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="515"/> - <source>Blank line inserted after docstring summary.</source> - <translation>Linea en blanco insertada detrás de docstring de resumen.</translation> + <source>Blank line inserted after class docstring.</source> + <translation>Linea en blanco insertada detrás de docstring.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="518"/> - <source>Blank line inserted after last paragraph of docstring.</source> - <translation>Linea en blanco insertada detrás de último párrafo de docstring.</translation> + <source>Blank line inserted after docstring summary.</source> + <translation>Linea en blanco insertada detrás de docstring de resumen.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="521"/> - <source>Leading quotes put on separate line.</source> - <translation>Comillas iniciales puestas en línea separada.</translation> + <source>Blank line inserted after last paragraph of docstring.</source> + <translation>Linea en blanco insertada detrás de último párrafo de docstring.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="524"/> - <source>Trailing quotes put on separate line.</source> - <translation>Comillas finales puestas en línea separada.</translation> + <source>Leading quotes put on separate line.</source> + <translation>Comillas iniciales puestas en línea separada.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="527"/> + <source>Trailing quotes put on separate line.</source> + <translation>Comillas finales puestas en línea separada.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> <source>Blank line before class docstring removed.</source> <translation>Línea en blanco antes de docstring de clase eliminada.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> - <source>Blank line after class docstring removed.</source> - <translation>Línea en blanco detrás de docstring eliminada.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="536"/> - <source>Blank line after function/method docstring removed.</source> - <translation>Línea en blanco detrás de docstring de función/método eliminada.</translation> + <source>Blank line after class docstring removed.</source> + <translation>Línea en blanco detrás de docstring eliminada.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="539"/> - <source>Blank line after last paragraph removed.</source> - <translation>Linea en blanco detrás de último párrafo eliminada.</translation> + <source>Blank line after function/method docstring removed.</source> + <translation>Línea en blanco detrás de docstring de función/método eliminada.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="542"/> - <source>Tab converted to 4 spaces.</source> - <translation>Tabulador convertido a 4 espacios.</translation> + <source>Blank line after last paragraph removed.</source> + <translation>Linea en blanco detrás de último párrafo eliminada.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="545"/> - <source>Indentation adjusted to be a multiple of four.</source> - <translation>Indentación ajustada para ser un múltiplo de cuatro.</translation> + <source>Tab converted to 4 spaces.</source> + <translation>Tabulador convertido a 4 espacios.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="548"/> - <source>Indentation of continuation line corrected.</source> - <translation>Indentación de línea de continuación corregida.</translation> + <source>Indentation adjusted to be a multiple of four.</source> + <translation>Indentación ajustada para ser un múltiplo de cuatro.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="551"/> - <source>Indentation of closing bracket corrected.</source> - <translation>Indentación de llave de cierre corregida.</translation> + <source>Indentation of continuation line corrected.</source> + <translation>Indentación de línea de continuación corregida.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="554"/> - <source>Missing indentation of continuation line corrected.</source> - <translation>Indentación inexistente en línea de continuación corregida.</translation> + <source>Indentation of closing bracket corrected.</source> + <translation>Indentación de llave de cierre corregida.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="557"/> - <source>Closing bracket aligned to opening bracket.</source> - <translation>Llave de cierre alineada a llave de apertura.</translation> + <source>Missing indentation of continuation line corrected.</source> + <translation>Indentación inexistente en línea de continuación corregida.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="560"/> - <source>Indentation level changed.</source> - <translation>Nivel de indentación corregida.</translation> + <source>Closing bracket aligned to opening bracket.</source> + <translation>Llave de cierre alineada a llave de apertura.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="563"/> - <source>Indentation level of hanging indentation changed.</source> - <translation>Nivel de indentación de indentación colgante corregida.</translation> + <source>Indentation level changed.</source> + <translation>Nivel de indentación corregida.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="566"/> + <source>Indentation level of hanging indentation changed.</source> + <translation>Nivel de indentación de indentación colgante corregida.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="569"/> <source>Visual indentation corrected.</source> <translation>Indentación visual corregida.</translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="584"/> + <source>Extraneous whitespace removed.</source> + <translation>Eliminado espacio en blanco extraño.</translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="581"/> - <source>Extraneous whitespace removed.</source> - <translation>Eliminado espacio en blanco extraño.</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="578"/> <source>Missing whitespace added.</source> <translation>Añadido espacio en blanco que faltaba.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="584"/> - <source>Whitespace around comment sign corrected.</source> - <translation>Espacio en blanco alrededor de signo de comentario corregido.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="587"/> + <source>Whitespace around comment sign corrected.</source> + <translation>Espacio en blanco alrededor de signo de comentario corregido.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="590"/> <source>One blank line inserted.</source> <translation>Insertada una línea en blanco.</translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="591"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> <source>%n blank line(s) inserted.</source> <translation> <numerusform>Insertada %n línea en blanco.</numerusform> @@ -3665,7 +3665,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="597"/> <source>%n superfluous lines removed</source> <translation> <numerusform>Eliminada %n línea en blanco sobrante</numerusform> @@ -3673,77 +3673,77 @@ </translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="598"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="601"/> <source>Superfluous blank lines removed.</source> <translation>Eliminadas líneas en blanco sobrantes.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="601"/> - <source>Superfluous blank lines after function decorator removed.</source> - <translation>Eliminadas líneas en blanco sobrantes después de decorador de función.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="604"/> - <source>Imports were put on separate lines.</source> - <translation>Imports estaban puestos en líneas separadas.</translation> + <source>Superfluous blank lines after function decorator removed.</source> + <translation>Eliminadas líneas en blanco sobrantes después de decorador de función.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="607"/> - <source>Long lines have been shortened.</source> - <translation>Líneas largas se han acortado.</translation> + <source>Imports were put on separate lines.</source> + <translation>Imports estaban puestos en líneas separadas.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="610"/> + <source>Long lines have been shortened.</source> + <translation>Líneas largas se han acortado.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="613"/> <source>Redundant backslash in brackets removed.</source> <translation>Backslash redundante en llaves eliminado.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="616"/> - <source>Compound statement corrected.</source> - <translation>Sentencia compuesta corregida.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="619"/> - <source>Comparison to None/True/False corrected.</source> - <translation>Comparación a None/True/False corregida.</translation> + <source>Compound statement corrected.</source> + <translation>Sentencia compuesta corregida.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="622"/> - <source>'{0}' argument added.</source> - <translation>Añadido el argumento '{0}'.</translation> + <source>Comparison to None/True/False corrected.</source> + <translation>Comparación a None/True/False corregida.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="625"/> - <source>'{0}' argument removed.</source> - <translation>Eliminado el argumento '{0}'.</translation> + <source>'{0}' argument added.</source> + <translation>Añadido el argumento '{0}'.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="628"/> - <source>Whitespace stripped from end of line.</source> - <translation>Espacio eliminado del final de la línea.</translation> + <source>'{0}' argument removed.</source> + <translation>Eliminado el argumento '{0}'.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="631"/> - <source>newline added to end of file.</source> - <translation>Carácter de nueva línea añadido al final del archivo.</translation> + <source>Whitespace stripped from end of line.</source> + <translation>Espacio eliminado del final de la línea.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="634"/> - <source>Superfluous trailing blank lines removed from end of file.</source> - <translation>Eliminadas líneas en blanco sobrantes de final de archivo.</translation> + <source>newline added to end of file.</source> + <translation>Carácter de nueva línea añadido al final del archivo.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="637"/> + <source>Superfluous trailing blank lines removed from end of file.</source> + <translation>Eliminadas líneas en blanco sobrantes de final de archivo.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="640"/> <source>'<>' replaced by '!='.</source> <translation>'<>' reemplazado por '!='.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="641"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="644"/> <source>Could not save the file! Skipping it. Reason: {0}</source> <translation>¡No se ha podido guardar el archivo! Va a ser omitido. Razón: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="710"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="713"/> <source> no message defined for code '{0}'</source> <translation>sin mensaje definido para el código '{0}'</translation> </message> @@ -4816,7 +4816,7 @@ <translation>Dominio:</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/> <source><no cookie selected></source> <translation><no hay cookie seleccionada></translation> </message> @@ -7009,197 +7009,197 @@ <context> <name>DocStyleChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="260"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="263"/> <source>module is missing a docstring</source> <translation>al módulo le falta un docstring</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="262"/> - <source>public function/method is missing a docstring</source> - <translation>a la función/método le falta un docstring</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="265"/> - <source>private function/method may be missing a docstring</source> - <translation>a la función/método privado le podría estar faltando un docstring</translation> + <source>public function/method is missing a docstring</source> + <translation>a la función/método le falta un docstring</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="268"/> + <source>private function/method may be missing a docstring</source> + <translation>a la función/método privado le podría estar faltando un docstring</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="271"/> <source>public class is missing a docstring</source> <translation>a la clase pública le falta un docstring</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="270"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="273"/> <source>private class may be missing a docstring</source> <translation>a la clase privada le podría estar faltando un docstring</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="272"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="275"/> <source>docstring not surrounded by """</source> <translation>docstring no rodeado de """</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="274"/> - <source>docstring containing \ not surrounded by r"""</source> - <translation>docstring contiene \ no rodeado de r"""</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="277"/> - <source>docstring containing unicode character not surrounded by u"""</source> - <translation>docstring contiene carácter unicode no rodeado de u"""</translation> + <source>docstring containing \ not surrounded by r"""</source> + <translation>docstring contiene \ no rodeado de r"""</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="280"/> + <source>docstring containing unicode character not surrounded by u"""</source> + <translation>docstring contiene carácter unicode no rodeado de u"""</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="283"/> <source>one-liner docstring on multiple lines</source> <translation>docstring de una línea en múltiples líneas</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="282"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="285"/> <source>docstring has wrong indentation</source> <translation>docstring tiene indentación errónea</translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="328"/> + <source>docstring summary does not end with a period</source> + <translation>docstring de resumen no termina en punto</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="291"/> + <source>docstring summary is not in imperative mood (Does instead of Do)</source> + <translation>docstring de resumen no expresado en forma imperativa (Hace en lugar de Hacer)</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="295"/> + <source>docstring summary looks like a function's/method's signature</source> + <translation>docstring de resumen parece una firma de función/método</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="298"/> + <source>docstring does not mention the return value type</source> + <translation>docstring no menciona el tipo de valor de retorno</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="301"/> + <source>function/method docstring is separated by a blank line</source> + <translation>docstring de función/método separado por línea en blanco</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="304"/> + <source>class docstring is not preceded by a blank line</source> + <translation>docstring de clase no precedido de línea en blanco</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="307"/> + <source>class docstring is not followed by a blank line</source> + <translation>docstring de clase no seguido de línea en blanco</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="362"/> + <source>docstring summary is not followed by a blank line</source> + <translation>docstring de resumen no seguido de línea en blanco </translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="313"/> + <source>last paragraph of docstring is not followed by a blank line</source> + <translation>último párrafo de docstring no seguido de línea en blanco</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="317"/> + <source>private function/method is missing a docstring</source> + <translation>función/método privado al que le falta docstring</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="320"/> + <source>private class is missing a docstring</source> + <translation>clase privada a la que falta un docstring</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="322"/> + <source>leading quotes of docstring not on separate line</source> + <translation>comillas iniciales de docstring no están en línea separada</translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="325"/> - <source>docstring summary does not end with a period</source> - <translation>docstring de resumen no termina en punto</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="288"/> - <source>docstring summary is not in imperative mood (Does instead of Do)</source> - <translation>docstring de resumen no expresado en forma imperativa (Hace en lugar de Hacer)</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="292"/> - <source>docstring summary looks like a function's/method's signature</source> - <translation>docstring de resumen parece una firma de función/método</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="295"/> - <source>docstring does not mention the return value type</source> - <translation>docstring no menciona el tipo de valor de retorno</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="298"/> - <source>function/method docstring is separated by a blank line</source> - <translation>docstring de función/método separado por línea en blanco</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="301"/> - <source>class docstring is not preceded by a blank line</source> - <translation>docstring de clase no precedido de línea en blanco</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="304"/> - <source>class docstring is not followed by a blank line</source> - <translation>docstring de clase no seguido de línea en blanco</translation> + <source>trailing quotes of docstring not on separate line</source> + <translation>comillas finales de docstring no están en línea separada</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="332"/> + <source>docstring does not contain a @return line but function/method returns something</source> + <translation>docstring no contiene una línea @return pero la función/método retorna algo </translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="336"/> + <source>docstring contains a @return line but function/method doesn't return anything</source> + <translation>docstring contiene una línea @return pero la función/método no retorna nada</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="340"/> + <source>docstring does not contain enough @param/@keyparam lines</source> + <translation>docstring no contiene suficientes líneas @param/@keyparam</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="343"/> + <source>docstring contains too many @param/@keyparam lines</source> + <translation>docstring contiene demasiadas líneas @param/@keyparam</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="346"/> + <source>keyword only arguments must be documented with @keyparam lines</source> + <translation>los argumentos de solo palabra clave deben estar documentados con líneas @keyparam</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="349"/> + <source>order of @param/@keyparam lines does not match the function/method signature</source> + <translation>orden de líneas @param/@keyparam no coincide con la firma de la función/método</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="352"/> + <source>class docstring is preceded by a blank line</source> + <translation>docstring de clase precedida de línea en blanco</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="354"/> + <source>class docstring is followed by a blank line</source> + <translation>docstring de clase seguida de línea en blanco</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="356"/> + <source>function/method docstring is preceded by a blank line</source> + <translation>docstring de función/método precedido de línea en blanco</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="359"/> - <source>docstring summary is not followed by a blank line</source> - <translation>docstring de resumen no seguido de línea en blanco </translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="310"/> - <source>last paragraph of docstring is not followed by a blank line</source> - <translation>último párrafo de docstring no seguido de línea en blanco</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="314"/> - <source>private function/method is missing a docstring</source> - <translation>función/método privado al que le falta docstring</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="317"/> - <source>private class is missing a docstring</source> - <translation>clase privada a la que falta un docstring</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="319"/> - <source>leading quotes of docstring not on separate line</source> - <translation>comillas iniciales de docstring no están en línea separada</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="322"/> - <source>trailing quotes of docstring not on separate line</source> - <translation>comillas finales de docstring no están en línea separada</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="329"/> - <source>docstring does not contain a @return line but function/method returns something</source> - <translation>docstring no contiene una línea @return pero la función/método retorna algo </translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="333"/> - <source>docstring contains a @return line but function/method doesn't return anything</source> - <translation>docstring contiene una línea @return pero la función/método no retorna nada</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="337"/> - <source>docstring does not contain enough @param/@keyparam lines</source> - <translation>docstring no contiene suficientes líneas @param/@keyparam</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="340"/> - <source>docstring contains too many @param/@keyparam lines</source> - <translation>docstring contiene demasiadas líneas @param/@keyparam</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="343"/> - <source>keyword only arguments must be documented with @keyparam lines</source> - <translation>los argumentos de solo palabra clave deben estar documentados con líneas @keyparam</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="346"/> - <source>order of @param/@keyparam lines does not match the function/method signature</source> - <translation>orden de líneas @param/@keyparam no coincide con la firma de la función/método</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="349"/> - <source>class docstring is preceded by a blank line</source> - <translation>docstring de clase precedida de línea en blanco</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="351"/> - <source>class docstring is followed by a blank line</source> - <translation>docstring de clase seguida de línea en blanco</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="353"/> - <source>function/method docstring is preceded by a blank line</source> - <translation>docstring de función/método precedido de línea en blanco</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="356"/> <source>function/method docstring is followed by a blank line</source> <translation>docstring de función/método seguido de línea en blanco</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="362"/> - <source>last paragraph of docstring is followed by a blank line</source> - <translation>último párrafo de docstring seguido de línea en blanco</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="365"/> + <source>last paragraph of docstring is followed by a blank line</source> + <translation>último párrafo de docstring seguido de línea en blanco</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="368"/> <source>docstring does not contain a @exception line but function/method raises an exception</source> <translation>docstring no contiene una línea @exception pero la función/método lanza una excepción</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="369"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="372"/> <source>docstring contains a @exception line but function/method doesn't raise an exception</source> <translation>docstring contiene una línea @exception pero la función/método no lanza una excepción</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="374"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="377"/> <source>{0}: {1}</source> <translation>{0}: {1}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="284"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="287"/> <source>docstring does not contain a summary</source> <translation>docstring no contiene un resumen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="327"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="330"/> <source>docstring summary does not start with '{0}'</source> <translation>docstring de resumen no empieza con '{0}'</translation> </message> @@ -7385,7 +7385,7 @@ <context> <name>DownloadManager</name> <message> - <location filename="../WebBrowser/Download/DownloadManager.py" line="363"/> + <location filename="../WebBrowser/Download/DownloadManager.ui" line="14"/> <source>Downloads</source> <translation>Descargas</translation> </message> @@ -7844,92 +7844,92 @@ <translation>Botones Estándar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="41"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="257"/> <source>Abort</source> <translation>Abortar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="42"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="264"/> <source>Apply</source> <translation>Aplicar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="43"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="271"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="44"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="278"/> <source>Close</source> <translation>Cerrar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="45"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="285"/> <source>Discard</source> <translation>Descartar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="46"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="292"/> <source>Help</source> <translation>Ayuda</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="47"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="299"/> <source>Ignore</source> <translation>Ignorar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="48"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="306"/> <source>No</source> <translation>No</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="49"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="313"/> <source>No to all</source> <translation>No a todo</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="50"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="320"/> <source>Ok</source> <translation>Ok</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="51"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="327"/> <source>Open</source> <translation>Abrir</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="52"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="334"/> <source>Reset</source> <translation>Restaurar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="53"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="341"/> <source>Restore defaults</source> <translation>Restaurar valores por defecto</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="54"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="348"/> <source>Retry</source> <translation>Reintentar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="55"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="355"/> <source>Save</source> <translation>Guardar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="56"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="362"/> <source>Save all</source> <translation>Guardar todo</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="57"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="369"/> <source>Yes</source> <translation>Si</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="58"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="376"/> <source>Yes to all</source> <translation>Si a todo</translation> </message> @@ -8990,892 +8990,892 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2878"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source>Open File</source> <translation>Abrir archivo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="658"/> - <source>Undo</source> - <translation>Deshacer</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="661"/> - <source>Redo</source> - <translation>Rehacer</translation> + <source>Undo</source> + <translation>Deshacer</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="664"/> + <source>Redo</source> + <translation>Rehacer</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="667"/> <source>Revert to last saved state</source> <translation>Volver al último estado guardado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="668"/> - <source>Cut</source> - <translation>Cortar</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="671"/> - <source>Copy</source> - <translation>Copiar</translation> + <source>Cut</source> + <translation>Cortar</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="674"/> + <source>Copy</source> + <translation>Copiar</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="677"/> <source>Paste</source> <translation>Pegar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="679"/> - <source>Indent</source> - <translation>Indentar</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="682"/> - <source>Unindent</source> - <translation>Desindentar</translation> + <source>Indent</source> + <translation>Indentar</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="685"/> - <source>Comment</source> - <translation>Pasar a comentario</translation> + <source>Unindent</source> + <translation>Desindentar</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="688"/> - <source>Uncomment</source> - <translation>Sacar de comentario</translation> + <source>Comment</source> + <translation>Pasar a comentario</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="691"/> - <source>Stream Comment</source> - <translation>Bloque de comentario</translation> + <source>Uncomment</source> + <translation>Sacar de comentario</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="694"/> + <source>Stream Comment</source> + <translation>Bloque de comentario</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="697"/> <source>Box Comment</source> <translation>Caja de comentario</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="698"/> - <source>Select to brace</source> - <translation>Seleccionar hasta la llave ( '{' o '}' )</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="700"/> - <source>Select all</source> - <translation>Seleccionar todo</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="701"/> + <source>Select to brace</source> + <translation>Seleccionar hasta la llave ( '{' o '}' )</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="703"/> + <source>Select all</source> + <translation>Seleccionar todo</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="704"/> <source>Deselect all</source> <translation>Deseleccionar todo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="715"/> + <location filename="../QScintilla/Editor.py" line="718"/> <source>Shorten empty lines</source> <translation>Acortar las líneas vacías</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="722"/> + <location filename="../QScintilla/Editor.py" line="725"/> <source>Use Monospaced Font</source> <translation>Usar fuente monoespaciada</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="727"/> + <location filename="../QScintilla/Editor.py" line="730"/> <source>Autosave enabled</source> <translation>Autoguardar habilitado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="768"/> + <location filename="../QScintilla/Editor.py" line="771"/> <source>Close</source> <translation>Cerrar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="774"/> - <source>Save</source> - <translation>Guardar</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="777"/> + <source>Save</source> + <translation>Guardar</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="780"/> <source>Save As...</source> <translation>Guardar como...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="793"/> + <location filename="../QScintilla/Editor.py" line="796"/> <source>Print</source> <translation>Imprimir</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="819"/> + <location filename="../QScintilla/Editor.py" line="822"/> <source>Complete from Document</source> <translation>Completar desde documento</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="821"/> + <location filename="../QScintilla/Editor.py" line="824"/> <source>Complete from APIs</source> <translation>Completar desde APIs</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="823"/> + <location filename="../QScintilla/Editor.py" line="826"/> <source>Complete from Document and APIs</source> <translation>Completar desde Documento y APIs</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="837"/> + <location filename="../QScintilla/Editor.py" line="840"/> <source>Check</source> <translation>Verificar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="857"/> - <source>Show</source> - <translation>Mostrar</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="859"/> - <source>Code metrics...</source> - <translation>Métricas de código...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="860"/> - <source>Code coverage...</source> - <translation>Cobertura de código...</translation> + <source>Show</source> + <translation>Mostrar</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="862"/> - <source>Show code coverage annotations</source> - <translation>Mostrar anotaciones de cobertura de codigo</translation> + <source>Code metrics...</source> + <translation>Métricas de código...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="863"/> + <source>Code coverage...</source> + <translation>Cobertura de código...</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="865"/> - <source>Hide code coverage annotations</source> - <translation>Ocultar anotaciones de cobertura de codigo</translation> + <source>Show code coverage annotations</source> + <translation>Mostrar anotaciones de cobertura de codigo</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="868"/> + <source>Hide code coverage annotations</source> + <translation>Ocultar anotaciones de cobertura de codigo</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="871"/> <source>Profile data...</source> <translation>Datos de profiling...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="881"/> + <location filename="../QScintilla/Editor.py" line="884"/> <source>Diagrams</source> <translation>Diagramas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="883"/> + <location filename="../QScintilla/Editor.py" line="886"/> <source>Class Diagram...</source> <translation>Diagrama de clases...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="885"/> + <location filename="../QScintilla/Editor.py" line="888"/> <source>Package Diagram...</source> <translation>Diagrama de paquetes...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="887"/> + <location filename="../QScintilla/Editor.py" line="890"/> <source>Imports Diagram...</source> <translation>Diagrama de imports...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="889"/> + <location filename="../QScintilla/Editor.py" line="892"/> <source>Application Diagram...</source> <translation>Diagrama de aplicación...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="907"/> - <source>Languages</source> - <translation>Lenguajes</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="910"/> + <source>Languages</source> + <translation>Lenguajes</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="913"/> <source>No Language</source> <translation>Ningún Lenguaje</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1030"/> + <location filename="../QScintilla/Editor.py" line="1033"/> <source>Export as</source> <translation>Exportar como</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1153"/> + <location filename="../QScintilla/Editor.py" line="1156"/> <source>Toggle bookmark</source> <translation>Alternar marcador</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1155"/> + <location filename="../QScintilla/Editor.py" line="1158"/> <source>Next bookmark</source> <translation>Nuevo marcador</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1157"/> + <location filename="../QScintilla/Editor.py" line="1160"/> <source>Previous bookmark</source> <translation>Marcador anterior</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1159"/> - <source>Clear all bookmarks</source> - <translation>Borrar todos los marcadores</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1162"/> + <source>Clear all bookmarks</source> + <translation>Borrar todos los marcadores</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1165"/> <source>Goto syntax error</source> <translation>Ir al error de sintaxis</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1164"/> + <location filename="../QScintilla/Editor.py" line="1167"/> <source>Show syntax error message</source> <translation>Ver el mensaje de error de sintaxis</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1166"/> + <location filename="../QScintilla/Editor.py" line="1169"/> <source>Clear syntax error</source> <translation>Borrar error de sintaxis</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1179"/> + <location filename="../QScintilla/Editor.py" line="1182"/> <source>Toggle breakpoint</source> <translation>Alternar punto de interrupción</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1181"/> - <source>Toggle temporary breakpoint</source> - <translation>Alternar punto de interrupción temporal</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1184"/> + <source>Toggle temporary breakpoint</source> + <translation>Alternar punto de interrupción temporal</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1187"/> <source>Edit breakpoint...</source> <translation>Editar punto de interrupción...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5154"/> + <location filename="../QScintilla/Editor.py" line="5161"/> <source>Enable breakpoint</source> <translation>Activar punto de interrupción</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1189"/> + <location filename="../QScintilla/Editor.py" line="1192"/> <source>Next breakpoint</source> <translation>Siguiente punto de interrupción</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1191"/> + <location filename="../QScintilla/Editor.py" line="1194"/> <source>Previous breakpoint</source> <translation>Punto de interrupción anterior</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1193"/> - <source>Clear all breakpoints</source> - <translation>Borrar todos los puntos de interrupción</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1196"/> - <source>Next uncovered line</source> - <translation>Siguiente línea sin cobertura</translation> + <source>Clear all breakpoints</source> + <translation>Borrar todos los puntos de interrupción</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="1199"/> - <source>Previous uncovered line</source> - <translation>Anterior línea sin cobertura</translation> + <source>Next uncovered line</source> + <translation>Siguiente línea sin cobertura</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="1202"/> + <source>Previous uncovered line</source> + <translation>Anterior línea sin cobertura</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1205"/> <source>Next task</source> <translation>Nueva tarea</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1204"/> + <location filename="../QScintilla/Editor.py" line="1207"/> <source>Previous task</source> <translation>Tarea anterior</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1213"/> + <location filename="../QScintilla/Editor.py" line="1216"/> <source>LMB toggles bookmarks</source> <translation>LMB (botón izquierdo del ratón) alterna marcadores</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1217"/> + <location filename="../QScintilla/Editor.py" line="1220"/> <source>LMB toggles breakpoints</source> <translation>LMB (botón izquierdo del ratón) alterna puntos de interrupción</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1253"/> + <location filename="../QScintilla/Editor.py" line="1256"/> <source>Export source</source> <translation>Exportar fuente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1253"/> + <location filename="../QScintilla/Editor.py" line="1256"/> <source>No export format given. Aborting...</source> <translation>No se ha proporcionado un formato de exportación. Abortando...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1752"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>Modification of Read Only file</source> <translation>Modificación de un archivo de solo lectura</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1752"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Usted está intentando modificar un archivo solo lectura. Por favor guarde en otro archivo primero.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2443"/> + <location filename="../QScintilla/Editor.py" line="2448"/> <source>Printing...</source> <translation>Imprimiendo...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2460"/> - <source>Printing completed</source> - <translation>Impresión completa</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2462"/> - <source>Error while printing</source> - <translation>Error al imprimir</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2465"/> + <source>Printing completed</source> + <translation>Impresión completa</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2467"/> + <source>Error while printing</source> + <translation>Error al imprimir</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2470"/> <source>Printing aborted</source> <translation>Impresión cancelada</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2823"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source>File Modified</source> <translation>Archivo modificado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3041"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source>Save File</source> <translation>Guardar archivo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4427"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion</source> <translation>Autocompletar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4427"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Autocompletar no está disponible porque no hay origen de datos para autocompletar.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5157"/> + <location filename="../QScintilla/Editor.py" line="5164"/> <source>Disable breakpoint</source> <translation>Deshabilitar punto de interrupción</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5531"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Code Coverage</source> <translation>Cobertura de codigo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5531"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Please select a coverage file</source> <translation>Por favor seleccione un archivo de cobertura</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5594"/> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>Show Code Coverage Annotations</source> <translation>Mostrar Anotaciones de Cobertura de Código</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5587"/> - <source>All lines have been covered.</source> - <translation>Todas las líneas han sido cubiertas.</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="5594"/> + <source>All lines have been covered.</source> + <translation>Todas las líneas han sido cubiertas.</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>There is no coverage file available.</source> <translation>No hay archivo de cobertura disponible.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5709"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Profile Data</source> <translation>Datos de profiling</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5709"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Please select a profile file</source> <translation>Por favor seleccione un archivo de profiling</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5869"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>Syntax Error</source> <translation>Error de sintaxis</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5869"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>No syntax error message available.</source> <translation>No hay mensajes de error de sintaxis disponibles.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6184"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Macro Name</source> <translation>Nombre de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6184"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Select a macro name:</source> <translation>Seleccione un nombre de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6212"/> + <location filename="../QScintilla/Editor.py" line="6219"/> <source>Load macro file</source> <translation>Cargar archivo de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6255"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Macro files (*.macro)</source> <translation>Archivos de Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6235"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source>Error loading macro</source> <translation>Error al cargar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6255"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Save macro file</source> <translation>Guardar archivo de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6272"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source>Save macro</source> <translation>Guardar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6288"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source>Error saving macro</source> <translation>Error al guardar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6301"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Start Macro Recording</source> <translation>Comenzar grabación de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6301"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Macro recording is already active. Start new?</source> <translation>Grabación de macro ya está activada. ¿Comenzar una nueva?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6327"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Macro Recording</source> <translation>Grabando macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6327"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Enter name of the macro:</source> <translation>Introduzca el nombre de la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6465"/> + <location filename="../QScintilla/Editor.py" line="6472"/> <source>File changed</source> <translation>Archivo modificado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6769"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source>Drop Error</source> <translation>Error al soltar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6790"/> + <location filename="../QScintilla/Editor.py" line="6797"/> <source>Resources</source> <translation>Recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6792"/> - <source>Add file...</source> - <translation>Añadir archivo...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6794"/> - <source>Add files...</source> - <translation>Añadir archivos...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6796"/> - <source>Add aliased file...</source> - <translation>Añadir archivo con un alias...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6799"/> - <source>Add localized resource...</source> - <translation>Añadir recursos localizados...</translation> + <source>Add file...</source> + <translation>Añadir archivo...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6801"/> + <source>Add files...</source> + <translation>Añadir archivos...</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="6803"/> + <source>Add aliased file...</source> + <translation>Añadir archivo con un alias...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6806"/> + <source>Add localized resource...</source> + <translation>Añadir recursos localizados...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6810"/> <source>Add resource frame</source> <translation>Añadir ventana de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6822"/> + <location filename="../QScintilla/Editor.py" line="6829"/> <source>Add file resource</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6838"/> + <location filename="../QScintilla/Editor.py" line="6845"/> <source>Add file resources</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6866"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Add aliased file resource</source> <translation>Añadir archivo de recursos con un alias</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6930"/> + <location filename="../QScintilla/Editor.py" line="6937"/> <source>Package Diagram</source> <translation>Digrama de paquetes</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6930"/> + <location filename="../QScintilla/Editor.py" line="6937"/> <source>Include class attributes?</source> <translation>¿Incluir atributos de clase?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6950"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Imports Diagram</source> <translation>Diagrama de imports</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6950"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Include imports from external modules?</source> <translation>¿Incluir los imports de módulos externos?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6964"/> + <location filename="../QScintilla/Editor.py" line="6971"/> <source>Application Diagram</source> <translation>Diagrama de aplicación</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6964"/> + <location filename="../QScintilla/Editor.py" line="6971"/> <source>Include module names?</source> <translation>¿Incluir nombres de módulos?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="746"/> + <location filename="../QScintilla/Editor.py" line="749"/> <source>Calltip</source> <translation>Consejo de llamada</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="790"/> + <location filename="../QScintilla/Editor.py" line="793"/> <source>Print Preview</source> <translation>Presentación preliminar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="400"/> + <location filename="../QScintilla/Editor.py" line="403"/> <source><b>A Source Editor Window</b><p>This window is used to display and edit a source file. You can open as many of these as you like. The name of the file is displayed in the window's titlebar.</p><p>In order to set breakpoints just click in the space between the line numbers and the fold markers. Via the context menu of the margins they may be edited.</p><p>In order to set bookmarks just Shift click in the space between the line numbers and the fold markers.</p><p>These actions can be reversed via the context menu.</p><p>Ctrl clicking on a syntax error marker shows some info about this error.</p></source> <translation><b>Una Ventana de Edición de Códigos Fuente</b><p>Esta ventana se utiliza para mostrar y editar un archivo de código fuente. Puede abrir tantas como desee. El nombre del archivo se muestra en la barra de título de la ventana.</p><p>Para insertar puntos de interrupción basta con hacer un click en el espacio entre los números de línea y los marcadores de plegado. Pueden editarse con el menú de contexto de los márgenes.</p><p>Para insertar marcadores solo hay que hacer Shift-click en el espacio entre los números de línea y los marcadores de plegado.</p><p>Estas acciones se pueden revertir utilizando el menú de contexto.</p><p>Haciendo Ctrl-click en un marcador de error sintáctico se muestra información sobre el dicho error.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="731"/> + <location filename="../QScintilla/Editor.py" line="734"/> <source>Typing aids enabled</source> <translation>Ayudas al tecleo habilitadas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="994"/> + <location filename="../QScintilla/Editor.py" line="997"/> <source>End-of-Line Type</source> <translation>Tipo de fin-de-línea</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="998"/> + <location filename="../QScintilla/Editor.py" line="1001"/> <source>Unix</source> <translation>Unix</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1005"/> + <location filename="../QScintilla/Editor.py" line="1008"/> <source>Windows</source> <translation>Windows</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1012"/> + <location filename="../QScintilla/Editor.py" line="1015"/> <source>Macintosh</source> <translation>Macintosh</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="953"/> + <location filename="../QScintilla/Editor.py" line="956"/> <source>Encodings</source> <translation>Codificaciones</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="933"/> + <location filename="../QScintilla/Editor.py" line="936"/> <source>Guessed</source> <translation>Suposición</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1268"/> + <location filename="../QScintilla/Editor.py" line="1271"/> <source>Alternatives</source> <translation>Alternativas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1284"/> + <location filename="../QScintilla/Editor.py" line="1287"/> <source>Pygments Lexer</source> <translation>Analizador Léxico de Pygments</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1284"/> + <location filename="../QScintilla/Editor.py" line="1287"/> <source>Select the Pygments lexer to apply.</source> <translation>Seleccionar el Analizador Léxico de Pygments.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7242"/> + <location filename="../QScintilla/Editor.py" line="7249"/> <source>Check spelling...</source> <translation>Corrección ortográfica...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="707"/> + <location filename="../QScintilla/Editor.py" line="710"/> <source>Check spelling of selection...</source> <translation>Corrección ortográfica de la selección...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7245"/> + <location filename="../QScintilla/Editor.py" line="7252"/> <source>Add to dictionary</source> <translation>Añadir al diccionario</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7247"/> + <location filename="../QScintilla/Editor.py" line="7254"/> <source>Ignore All</source> <translation>Ignorar Todo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="711"/> + <location filename="../QScintilla/Editor.py" line="714"/> <source>Remove from dictionary</source> <translation>Eliminar del diccionario</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="340"/> + <location filename="../QScintilla/Editor.py" line="343"/> <source><p>The size of the file <b>{0}</b> is <b>{1} KB</b>. Do you really want to load it?</p></source> <translation><p>El tamaño del archivo <b>{0}</b> es <b>{1} KB</b>. ¿Desea cargarlo de todos modos?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1245"/> + <location filename="../QScintilla/Editor.py" line="1248"/> <source><p>No exporter available for the export format <b>{0}</b>. Aborting...</p></source> <translation><p>No hay un exportador disponible para el formato de exportación <b>{0}</b>. Abortando...</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1264"/> + <location filename="../QScintilla/Editor.py" line="1267"/> <source>Alternatives ({0})</source> <translation>Alternativas ({0})</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2823"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>El archivo <b>{0}</b> tiene cambios sin guardar.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2878"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>El archivo<b>{0}</b> no puede ser abierto.<br />Causa: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2982"/> + <location filename="../QScintilla/Editor.py" line="2987"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>El archivo <b>{0}</b> no puede ser guardado.<br>Causa: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6226"/> + <location filename="../QScintilla/Editor.py" line="6233"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo de macro <b>{0}</b> no se puede leer.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6235"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>El archivo de macro <b>{0}</b> está dañado</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6288"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>El archivo de macro <b>{0}</b> no se puede escribir.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6629"/> + <location filename="../QScintilla/Editor.py" line="6636"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6769"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> no es un archivo.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6866"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias para el archivo <b>{0}</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1169"/> - <source>Next warning</source> - <translation>Siguiente advertencia</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1172"/> + <source>Next warning</source> + <translation>Siguiente advertencia</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1175"/> <source>Previous warning</source> <translation>Anterior advertencia</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1174"/> + <location filename="../QScintilla/Editor.py" line="1177"/> <source>Show warning message</source> <translation>Mostrar mensaje de advertencia</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1176"/> + <location filename="../QScintilla/Editor.py" line="1179"/> <source>Clear warnings</source> <translation>Limpiar advertencias</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3041"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6272"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo de macro <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6123"/> - <source>Warning: {0}</source> - <translation>Advertencia: {0}</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6130"/> + <source>Warning: {0}</source> + <translation>Advertencia: {0}</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6137"/> <source>Error: {0}</source> <translation>Error: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6461"/> + <location filename="../QScintilla/Editor.py" line="6468"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Advertencia:</b> Perderá los cambios si lo reabre.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4532"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Activating Auto-Completion Provider</source> <translation>Activando el Proveedor de Autocompletado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4532"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>El proveedor de autocompletado no puede ser conectado porque ya hay uno activo. Por favor revise la configuración.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4852"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Activating Calltip Provider</source> <translation>Activando Proveedor de Calltip</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4852"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>El proveedor de calltip no puede ser conectado porque ya hay uno activo. Por favor revise la configuración.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="786"/> + <location filename="../QScintilla/Editor.py" line="789"/> <source>Open 'rejection' file</source> <translation>Abrir archivo 'de rechazo'</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="893"/> + <location filename="../QScintilla/Editor.py" line="896"/> <source>Load Diagram...</source> <translation>Cargar Diagrama...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1207"/> - <source>Next change</source> - <translation>Siguiente cambio</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1210"/> + <source>Next change</source> + <translation>Siguiente cambio</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1213"/> <source>Previous change</source> <translation>Cambio anterior</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7659"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>Sort Lines</source> <translation>Ordenar Líneas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7659"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>La selección contiene datos ilegales para una ordenación numérica.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6059"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>Warning</source> <translation>Advertencia</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6059"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>No warning messages available.</source> <translation>No hay mensajes de advertencia disponibles.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6120"/> + <location filename="../QScintilla/Editor.py" line="6127"/> <source>Style: {0}</source> <translation>Estilo: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="760"/> - <source>New Document View</source> - <translation>Nueva Vista de Documento</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="763"/> + <source>New Document View</source> + <translation>Nueva Vista de Documento</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="766"/> <source>New Document View (with new split)</source> <translation>Nueva Vista de Documento (con nueva división)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="847"/> + <location filename="../QScintilla/Editor.py" line="850"/> <source>Tools</source> <translation>Herramientas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="975"/> + <location filename="../QScintilla/Editor.py" line="978"/> <source>Re-Open With Encoding</source> <translation>Reabrir Con Codificación</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6455"/> + <location filename="../QScintilla/Editor.py" line="6462"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation><p>El archivo <b>{0}</b> ha cambiado mientras estaba abierto en eric6. ¿Desea volver a cargarlo?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="738"/> + <location filename="../QScintilla/Editor.py" line="741"/> <source>Automatic Completion enabled</source> <translation>Autocompletar habilitado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="816"/> + <location filename="../QScintilla/Editor.py" line="819"/> <source>Complete</source> <translation>Completo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4581"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>Auto-Completion Provider</source> <translation>Proveedor de Autocompletado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4581"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>El proveedor de lista de completado'{0}' ya está registrado. Se ignora la solicitud duplicada.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>Call-Tips Provider</source> <translation>Proveedor de Call-Tips</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>El proveedor de call-tips'{0}' ya está registrado. Se ignora la solicitud duplicada.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7746"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>Register Mouse Click Handler</source> <translation>Registrar Manejador de Clicks de Ratón</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7746"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation>Un manejador de clicks de ratón para "{0}" ya está registrado por "{1}". Abortando solicitud por "{2}"...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="780"/> + <location filename="../QScintilla/Editor.py" line="783"/> <source>Save Copy...</source> <translation>Guardar Copia...</translation> </message> @@ -9918,7 +9918,7 @@ <translation>Presione para seleccionar un archivo API desde la lista de APIs instaladas</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="146"/> <source>Add from installed APIs</source> <translation>Añadir de las APIs instaladas</translation> </message> @@ -9928,7 +9928,7 @@ <translation>Pulse para compilar la definición de las APIs seleccionadas</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="299"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="173"/> <source>Compile APIs</source> <translation>Compilar APIs</translation> </message> @@ -9968,12 +9968,12 @@ <translation>Archivos API (*.api);; Todos los archivos (*)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="238"/> <source>Select from the list of installed API files</source> <translation>Seleccione de la lista de archivos API instalados</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="314"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="316"/> <source>Cancel compilation</source> <translation>Cancelar compilación</translation> </message> @@ -9983,17 +9983,17 @@ <translation>Pulse para seleccionar un archivo de API de la lista de archivos de API instalados por los plugins</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="156"/> <source>Add from Plugin APIs</source> <translation>Añadir desde las APIs de plugins</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> <source>Select from the list of API files installed by plugins</source> <translation>Seleccione de la lista de archivos de API instalados por plugins</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> <source>There are no APIs installed yet. Selection is not available.</source> <translation>Todavía no se han instalado APIs. La selección no está disponible.</translation> </message> @@ -10160,6 +10160,89 @@ </message> </context> <context> + <name>EditorButtonsWidget</name> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="175"/> + <source>Bold</source> + <translation>Negrita</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="177"/> + <source>Italic</source> + <translation>Cursiva</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="179"/> + <source>Strike Through</source> + <translation>Tachado</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="182"/> + <source>Header 1</source> + <translation>Encabezamiento 1</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="184"/> + <source>Header 2</source> + <translation>Encabezamiento 2</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="186"/> + <source>Header 3</source> + <translation>Encabezamiento 3</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="188"/> + <source>Header</source> + <translation>Encabezamiento</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="193"/> + <source>Inline Code</source> + <translation>Código Inline</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="195"/> + <source>Code Block</source> + <translation>Bloque de Código</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="197"/> + <source>Quote</source> + <translation>Cita</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="200"/> + <source>Add Hyperlink</source> + <translation>Añadir Hiperenlace</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="202"/> + <source>Add Horizontal Line</source> + <translation>Añadir Línea Horizontal</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="204"/> + <source>Add Image</source> + <translation>Añadir Imagen</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="207"/> + <source>Add Bulleted List</source> + <translation>Añadir Lista con Puntos</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="209"/> + <source>Add Numbered List</source> + <translation>Añadir Lista con Números</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="273"/> + <source>Level {0}</source> + <translation>Nivel {0}</translation> + </message> +</context> +<context> <name>EditorCalltipsPage</name> <message> <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="17"/> @@ -10969,7 +11052,7 @@ <translation>Seleccione el análizador léxico alternativo al que asociar</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightersPage.py" line="142"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightersPage.py" line="146"/> <source>Alternative</source> <translation>Alternativo</translation> </message> @@ -11002,7 +11085,7 @@ <translation>Selecciona llenar hasta el fin de la línea.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="113"/> <source>Fill to end of line</source> <translation>Llenar hasta el final de la línea</translation> </message> @@ -11047,7 +11130,7 @@ <translation>Selección de Fuente.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/> <source>Font</source> <translation>Fuente</translation> </message> @@ -11072,17 +11155,17 @@ <translation>Todo llena hasta el final de la línea</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="351"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="355"/> <source>Enabled</source> <translation>Habilitado</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="352"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="356"/> <source>Disabled</source> <translation>Deshabilitado</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> <source>Select fill to end of line for all styles</source> <translation>Selecciona llenar hasta el final de línea para todos los estilos</translation> </message> @@ -11142,27 +11225,27 @@ <translation>Exportar todos los estilos</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465"/> <source>Export Highlighting Styles</source> <translation>Exportar Estilos de Resaltado</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="497"/> <source>Import Highlighting Styles</source> <translation>Importar Estilos de Resaltado</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="477"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="481"/> <source>Highlighting styles file (*.e4h)</source> <translation>Archivos de estilos de resaltado (*.e4h)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465"/> <source><p>The highlighting styles could not be exported to file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Los estilos de resaltado no se han podido exportar al archivo <b>{0}</b>.</p><p>Razón: {1}</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="497"/> <source><p>The highlighting styles could not be read from file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Los estilos de resaltado no se han podido leer del archivo <b>{0}</b>.</p><p>Razón: {1}</p></translation> </message> @@ -11289,12 +11372,12 @@ <translation>Analizador léxico de Bash</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1048"/> <source>Select whether folding of comments shall be possible</source> <translation>Seleccionar si el plegado de comentarios será posible</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1051"/> <source>Fold comments</source> <translation>Plegado de comentarios</translation> </message> @@ -11324,22 +11407,22 @@ <translation>Indentar al abrir llave ('{')</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="990"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/> <source>Select whether folding at else statement should be possible</source> <translation>Seleccionar si el plegado en las sentencias else debe ser posible</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/> <source>Fold at else</source> <translation>Plegado en los else</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="522"/> <source>Select whether folding of preprocessor directives shall be possible</source> <translation>Seleccionar si el plegado de directivas de preprocesamiento debe ser posible</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="525"/> <source>Fold preprocessor directives</source> <translation>Plegado en directivas de preprocesamiento</translation> </message> @@ -11384,127 +11467,127 @@ <translation>Etiquetas sensibles a mayúsculas/minúsculas</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="516"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/> <source>Perl Lexer Properties</source> <translation>Propiedades del Analizador Léxico de Perl</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="637"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/> <source>Povray Lexer Properties</source> <translation>Propiedades del Analizador Léxico de Povray</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="643"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/> <source>Select whether folding of directives shall be possible</source> <translation>Selecciona si el plegado de directivas será posible</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="646"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/> <source>Fold directives</source> <translation>Plegado en directivas</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="685"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> <source>Python Lexer Properties</source> <translation>Propiedades del Analizador Léxico de Python</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="796"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="825"/> <source>Select whether bad indentation shall be highlighted</source> <translation>Seleccionar si la indentación errónea debe ser resaltada</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="721"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="750"/> <source>Select whether text should be autoindented after a ':'</source> <translation>Seleccionar si el texto se debe autoindentar despues de un ':'</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="724"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="753"/> <source>Auto indentation after ':'</source> <translation>Autoindentación despues de ':'</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="730"/> <source>Select whether folding of strings shall be possible</source> <translation>Seleccionar si el plegado de cadenas debe ser posible</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="733"/> <source>Fold strings</source> <translation>Plegado de cadenas</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="827"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/> <source>SQL Lexer Properties</source> <translation>Propiedades del Analizador Léxico de SQL</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="863"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="892"/> <source>Select to enable Backslash Escapes</source> <translation>Seleccionar hara habilitar secuencias de Escape con Backslash</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="866"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="895"/> <source>Backslash Escapes</source> <translation>Secuencias de Escape con Backslash</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="964"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/> <source>VHDL Lexer Properties</source> <translation>Propiedades del Analizador Léxico de VHDL</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="999"/> <source>Select whether folding of blocks at a parenthesis shall be possible</source> <translation>Seleccionar si el plegado de bloques en los paréntesis debe ser posible</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1002"/> <source>Fold at parenthesis</source> <translation>Plegar en los paréntesis</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1009"/> <source>Select whether folding of begin blocks shall be possible</source> <translation>Selecciona si el plegado de bloques begin debe ser posible</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1012"/> <source>Fold at begin</source> <translation>Plegar en begin</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/> <source>Pascal Lexer Properties</source> <translation>Propiedades del Analizador Léxico de Pascal</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="565"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="594"/> <source>PostScript Lexer Properties</source> <translation>Propiedades del Analizador Léxico de PostScript</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="581"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="610"/> <source>Select to mark tokens</source> <translation>Seleccione para marcar token</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="584"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="613"/> <source>Mark Tokens</source> <translation>Marcar Tokens</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="593"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="622"/> <source>PostScript Level:</source> <translation>Nivel de PostScript:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="600"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="629"/> <source>Select the PostScript level</source> <translation>Seleccione el nivel de PostScript</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1013"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1042"/> <source>YAML Lexer Properties</source> <translation>Propiedades del Analizador Léxico de YAML</translation> </message> @@ -11554,62 +11637,62 @@ <translation>Estilos en los scripts</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="503"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/> <source>Select to enable smart highlighting of keywords</source> <translation>Seleccionar para permitir resaltado inteligente de palabras clave</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/> - <source>Smart Highlighting</source> - <translation>Resaltado inteligente</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/> - <source>Select to enable folding of Perl packages</source> - <translation>Seleccionar para permitir plegado de paquetes Perl</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="535"/> + <source>Smart Highlighting</source> + <translation>Resaltado inteligente</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="561"/> + <source>Select to enable folding of Perl packages</source> + <translation>Seleccionar para permitir plegado de paquetes Perl</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="564"/> <source>Fold packages</source> <translation>Plegado de paquetes</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="542"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="571"/> <source>Select to enable folding of Perl POD blocks</source> <translation>Seleccionar para permitir plegado de bloques POD de Perl</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="574"/> <source>Fold POD blocks</source> <translation>Plegado de bloques POD</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="741"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="770"/> <source>Select to allow Python v2 unicode string literals (e.g. u"utf8")</source> <translation>Seleccionar para permitir literales de cadena unicode Python v2 (p. e. u"utf8")</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="744"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="773"/> <source>Allow v2 unicode string literals</source> <translation>Permitir literales de cadena unicode v2</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="751"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="780"/> <source>Select to allow Python v3 binary and octal literals (e.g. 0b1011, 0o712)</source> <translation>Seleccionar para permitir literales binarios y octales Python v3 (p. e. 0b1011, 0o712)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="754"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/> <source>Allow v3 binary and octal literals</source> <translation>Permitir literales binarios y octales v3</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="761"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="790"/> <source>Select to allow Python v3 bytes string literals (e.g. b"bytes")</source> <translation>Seleccionar para permitir literales de cadena de bytes Python v3 (p. e. b"bytes")</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="764"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="793"/> <source>Allow v3 bytes string literals</source> <translation>Permitir literales de cadena de bytes v3</translation> </message> @@ -11644,112 +11727,112 @@ <translation>Habilitar plantillas Mako</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="695"/> <source>Properties Lexer Properties</source> <translation>Propiedades del Analizador Léxico de Propiedades</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/> <source>Select to allow initial spaces in a line</source> <translation>Seleccionar para permitir espacios al inicio en una línea</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/> <source>Allow initial spaces</source> <translation>Permitir espacios al inicio</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="740"/> <source>Select whether folding of triple quoted strings shall be possible</source> <translation>Seleccionar si el plegado de cadenas con triple comilla debe ser posible</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="743"/> <source>Fold triple quoted strings</source> <translation>Plegado de cadenas de triple comilla</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="760"/> <source>Select to allow strings to span newline characters</source> <translation>Seleccionar para permitir a las cadenas generar caracteres de nueva línea</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="734"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="763"/> <source>Strings may span newline characters</source> <translation>Las cadenas pueden generar caracteres de nueva línea</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="808"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="837"/> <source>Ruby Lexer Properties</source> <translation>Propiedades del Analizador Léxico de Ruby</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="853"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="882"/> <source>Select whether only BEGIN blocks can be folded</source> <translation>Selecciona si solamente los bloques BEGIN pueden ser plegados</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="885"/> <source>Only BEGIN blocks can be folded</source> <translation>Solamente los bloques BEGIN pueden ser plegados</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="873"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="902"/> <source>Select if words may contain dots</source> <translation>Seleccionar si las palabras pueden contener puntos</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="876"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="905"/> <source>Words may contain dots</source> <translation>Las palabras pueden contener puntos</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="883"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="912"/> <source>Select to allow '#' as a comment character</source> <translation>Seleccionar para permitir '#' como carácter de comentario</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="886"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="915"/> <source>Allow '#' as comment character</source> <translation>Permitir '#' como carácter de comentario</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="893"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="922"/> <source>Select to enable quoted identifiers</source> <translation>Seleccionar para habilitar identificadores entre comillas</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="896"/> - <source>Enable quoted identifiers</source> - <translation>Habilitar identificadores entre comillas</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="906"/> - <source>TCL Lexer Properties</source> - <translation>Propiedades del Analizador Léxico de TCL</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="925"/> - <source>TeX Lexer Properties</source> - <translation>Propiedades del Analizador Léxico de TeX</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="941"/> - <source>Select to treat comments as TeX source</source> - <translation>Seleccionar para tratar comentarios como fuente TeX</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="944"/> - <source>Treat comments as TeX source</source> - <translation>Tratar comentarios como fuente TeX</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="951"/> - <source>Select to treat \if<unknown> as a command</source> - <translation>Seleccionar para tratar \if<unknown> como un comando</translation> + <source>Enable quoted identifiers</source> + <translation>Habilitar identificadores entre comillas</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="935"/> + <source>TCL Lexer Properties</source> + <translation>Propiedades del Analizador Léxico de TCL</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="954"/> + <source>TeX Lexer Properties</source> + <translation>Propiedades del Analizador Léxico de TeX</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/> + <source>Select to treat comments as TeX source</source> + <translation>Seleccionar para tratar comentarios como fuente TeX</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/> + <source>Treat comments as TeX source</source> + <translation>Tratar comentarios como fuente TeX</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/> + <source>Select to treat \if<unknown> as a command</source> + <translation>Seleccionar para tratar \if<unknown> como un comando</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/> <source>Treat \if<unknown> as command</source> <translation>Tratar \if<unknown> como comando</translation> </message> @@ -11759,7 +11842,7 @@ <translation>Resaltar cadenas de triple comilla</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="774"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="803"/> <source>Highlight sub-identifiers</source> <translation>Resaltar sub-identificadores</translation> </message> @@ -11769,7 +11852,7 @@ <translation>Seleccionar para resaltar cadenas de triple comilla</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="771"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="800"/> <source>Select to highlight sub-identifiers defined in keyword set 2</source> <translation>Seleccionar para resaltar sub-identificadores definidos en el conjunto de palabras clave 2</translation> </message> @@ -11824,32 +11907,32 @@ <translation>CoffeeScript</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="812"/> <source>Highlight bad indentation:</source> <translation>Resaltar indentación errónea:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>No Warning</source> <translation>Sin Advertencias</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Inconsistent</source> <translation>Inconsistente</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Tabs after Spaces</source> <translation>Tabuladores despues de Espacios</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Spaces</source> <translation>Espacios</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Tabs</source> <translation>Tabuladores</translation> </message> @@ -11869,7 +11952,7 @@ <translation>Seleccionar para resaltar secuencias de escape</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="194"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/> <source>Highlight escape sequences</source> <translation>Resaltar secuencias de escape</translation> </message> @@ -11883,6 +11966,26 @@ <source>Allow verbatim string escape sequences</source> <translation>Permitir secuencias de escape con cadenas literales</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/> + <source>JSON</source> + <translation>JSON</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="483"/> + <source>Select to enable highlighting of line/block comments</source> + <translation>Seleccionar para habilitar resaltado de comentarios de línea/bloque</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="486"/> + <source>Highlight comments</source> + <translation>Resaltar comentarios</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/> + <source>Select to enable highlighting of escape sequences in strings</source> + <translation>Seleccionar para habilitar resaltado de secuencias de escape en cadenas</translation> + </message> </context> <context> <name>EditorSearchPage</name> @@ -12478,7 +12581,7 @@ <translation>Modo:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/> <source>Disabled</source> <translation>Deshabilitado</translation> </message> @@ -12997,6 +13100,16 @@ <source>Select the colour for the search marker</source> <translation>Seleccionar el color para el marcador de búsqueda</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1866"/> + <source>Select to hide the Format Buttons bar when formatting is not supported</source> + <translation>Seleccionar para ocultar la barra de Botones de Formato cuando formatear no está soportado</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1869"/> + <source>Hide Format Buttons bar when not supported</source> + <translation>Ocultar barra de Botones de Formato cuando no esté soportado</translation> + </message> </context> <context> <name>EditorSyntaxPage</name> @@ -13262,7 +13375,7 @@ <context> <name>EmailDialog</name> <message> - <location filename="../UI/EmailDialog.py" line="339"/> + <location filename="../UI/EmailDialog.ui" line="13"/> <source>Send bug report</source> <translation>Enviar informe de bugs</translation> </message> @@ -13332,17 +13445,17 @@ <translation>¿Realmente desea cerrar el diálogo?</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="293"/> + <location filename="../UI/EmailDialog.py" line="300"/> <source>Mail Server Password</source> <translation>Contraseña para el servidor de correo</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="293"/> + <location filename="../UI/EmailDialog.py" line="300"/> <source>Enter your mail server password</source> <translation>Introduzca su contraseña para el servidor de correo</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="357"/> + <location filename="../UI/EmailDialog.py" line="364"/> <source>Attach file</source> <translation>Insertar archivo</translation> </message> @@ -13372,12 +13485,12 @@ <translation>Enviar solicitud de característica</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="311"/> + <location filename="../UI/EmailDialog.py" line="318"/> <source><p>Authentication failed.<br>Reason: {0}</p></source> <translation><p>La autenticación ha fallado.<br/> Razón: {0}</p></translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="339"/> + <location filename="../UI/EmailDialog.py" line="346"/> <source><p>Message could not be sent.<br>Reason: {0}</p></source> <translation><p>El mensaje no ha podido ser enviado.<br/>Razón: {0}</p></translation> </message> @@ -13390,17 +13503,17 @@ <translation><b>Configurar Correo electrónico</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="183"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="225"/> <source>Enter your password for accessing the mail server</source> <translation>Introduzca su contraseña para acceder al servidor de correo</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="211"/> <source>Enter your mail server username</source> <translation>Introduzca su nombre de usuario en el servidor de correo</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="106"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="170"/> <source>Signature:</source> <translation>Firma:</translation> </message> @@ -13410,52 +13523,47 @@ <translation>Introduzca la dirección de su servidor de correo</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="92"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/> <source>Email address:</source> <translation>Dirección de correo electrónico:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="116"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="180"/> <source>Enter your email signature</source> <translation>Introduzca su firma para los correos</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="99"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/> <source>Enter your email address</source> <translation>Introduzca su dirección de correo electrónico</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="138"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="192"/> <source>Select to authenticatate against the mail server</source> <translation>Seleccionar para autenticación contra el servidor de correo</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="141"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="195"/> <source>Mail server needs authentication</source> <translation>El servidor de correo necesita autenticación</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="153"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="204"/> <source>Username:</source> <translation>Nombre de Usuario:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="173"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="218"/> <source>Password:</source> <translation>Contraseña:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="128"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="104"/> <source>Select to use TLS</source> <translation>Seleccionar para usar TLS</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="131"/> - <source>Use TLS</source> - <translation>Usar TLS</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="60"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="124"/> <source>Enter the port of the mail server</source> <translation>Introduzca el puerto del servidor de correo</translation> </message> @@ -13465,35 +13573,65 @@ <translation>Servidor de correo saliente (SMTP):</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/> - <source>Outgoing mail server port:</source> - <translation>Puerto de servidor de correo saliente:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="193"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="235"/> <source>Press to test the login data</source> <translation>Pulse para probar los datos de login</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="196"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="238"/> <source>Test Login</source> <translation>Probar Login</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/> <source>Login Test</source> <translation>Prueba de Login</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="138"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="204"/> <source>The login test succeeded.</source> <translation>La prueba de login ha resultado con éxito.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/> <source><p>The login test failed.<br>Reason: {0}</p></source> <translation><p>El login ha fallado.<br/> Razón: {0}</p></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/> + <source>Encryption Method:</source> + <translation>Método de Encriptación:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="81"/> + <source>Select to use no encryption</source> + <translation>Seleccionar para no utilizar encriptación</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="84"/> + <source>None</source> + <translation>Ninguno</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="94"/> + <source>Select to use SSL</source> + <translation>Seleccionar para usar SSL</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="97"/> + <source>SSL</source> + <translation>SSL</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="107"/> + <source>TLS</source> + <translation>TLS</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="117"/> + <source>Port:</source> + <translation>Puerto:</translation> + </message> </context> <context> <name>EricAccessHandler</name> @@ -14391,54 +14529,54 @@ <context> <name>ExceptionsFilterDialog</name> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="13"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="14"/> <source>Exceptions Filter</source> <translation>Filtro de excepciones</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="16"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="17"/> <source><b>Exception Filter</b> <p>This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the "Start Debugging" dialog is unchecked, no exception will be reported at all.</p> <p>Please note, that unhandled exceptions are always highlighted independent of these settings.</p></source> <translation><b>Filtro de excepciones</b><p>Este diálogo se utiliza para introducir los tipos de excepción que deben ser resaltados durante una sesión de depuración. Si la lista esta vacía, todos los tipos de excepción serán resaltados. Si el flag de reportar excepciones en el diálogo 'Comenzar depuración' no está marcado, no se reportará ninguna excepción.</p><p>Note por favor que las excepciones no controlads siempre son resaltadas, independientemente de las opciones de configuración.</p></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="66"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="61"/> <source>Press to delete the selected exception from the list</source> <translation>Pulse para borrar la excepción seleccionada de la lista</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="69"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="64"/> <source>Delete</source> <translation>Borrar</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="52"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="51"/> <source>Enter an exception type that shall be highlighted</source> <translation>Introduzca un tipo de excepción que debe ser resaltado</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="27"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="28"/> <source>List of exceptions that shall be highlighted</source> <translation>Lista de excepciones que serán resaltadas</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="42"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="41"/> <source>Press to add the entered exception to the list</source> <translation>Pulse para añadir la excepción introducida a la lista</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="45"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="44"/> <source>Add</source> <translation>Añadir</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="76"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="71"/> <source>Press to delete all exceptions from the list</source> <translation>Pulse para borrar todas las excepciones de la lista</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="79"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="74"/> <source>Delete All</source> <translation>Borrar todas</translation> </message> @@ -14658,12 +14796,12 @@ <translation>Notificaciones</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110"/> + <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="122"/> <source>Host</source> <translation>Host</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="111"/> + <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="127"/> <source>Permission</source> <translation>Permiso</translation> </message> @@ -14678,7 +14816,7 @@ <translation>Eliminar Todo</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="51"/> + <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="97"/> <source>Geolocation</source> <translation>Geolocalización</translation> </message> @@ -15802,7 +15940,7 @@ <translation>Nombre:</translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/> <source><no flash cookie selected></source> <translation><no hay cookie de flash seleccionada></translation> </message> @@ -15812,7 +15950,7 @@ <translation>Tamaño:</translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="122"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="137"/> <source>Origin:</source> <translation>Origen:</translation> </message> @@ -15847,7 +15985,7 @@ <translation>Pulsar para eliminar las cookies de flash seleccionadas</translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="213"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="225"/> <source>Remove Cookie</source> <translation>Eliminar Cookie</translation> </message> @@ -16275,7 +16413,7 @@ <context> <name>GreaseMonkeyAddScriptDialog</name> <message> - <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py" line="105"/> + <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.ui" line="14"/> <source>GreaseMonkey Script Installation</source> <translation>Instalación de Script de GreaseMonkey</translation> </message> @@ -21433,7 +21571,7 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1822"/> <source>The hg process did not finish within 30s.</source> <translation>El proceso hg no terminó en un plazo de 30s.</translation> </message> @@ -21483,147 +21621,147 @@ <translation>Renombrando {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1057"/> <source>Merging</source> <translation>Haciendo un merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/> <source>Pulling from a remote Mercurial repository</source> <translation>Haciendo pull de un repositorio remoto Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2022"/> <source>Pushing to a remote Mercurial repository</source> <translation>Haciendo push a un repositorio remoto Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1359"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230"/> <source>Creating branch in the Mercurial repository</source> <translation>Creando branch en el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verificando la integridad del repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403"/> <source>Showing the combined configuration settings</source> <translation>Mostrando los ajustes de configuración combinados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2427"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2451"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> <source>Shall the working directory be updated?</source> <translation>¿Debe ser actualizado el directorio de trabajo?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2604"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2730"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2727"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2625"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2475"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2759"/> <source>Removing files from the Mercurial repository only</source> <translation>Eliminando archivos unicamente del repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2710"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793"/> <source>No revision given. Aborting...</source> <translation>No se ha proporcionado revisión. Abortando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2623"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2578"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo changegroup de Mercurial <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>¿Está seguro de que quiere aplicar un rollback a la última transacción?</translation> </message> @@ -21633,72 +21771,72 @@ <translation>Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido reiniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido iniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2959"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> <source>Add Sub-repository</source> <translation>Añadir Sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>No se ha podido leer el archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>El archivo .hgsub de sub-repositorios ya contiene una entrada.</p><p>Abortando...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>No se ha podido escribir al archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source>Remove Sub-repositories</source> <translation>Eliminar Sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>El archivo de subrepositorios .hgsub no existe. Abortando...</p></translation> </message> @@ -21713,157 +21851,157 @@ <translation>La operación de commit afecta a archivos que tienen cambios sin guardar. ¿Continuar con la operación de commit?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1030"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="997"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation>¿Realmente desea revertir todos los cambios a estos archivos o directorios?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Do you really want to revert all changes of the project?</source> <translation>¿Realmente desea revertir todos los cambios del proyecto?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> <source>Create Unversioned Archive</source> <translation>Crear Archivo Sin Versionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> <source>Mercurial Side-by-Side Difference</source> <translation>Diferencia Lado a Lado Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo <b>{0}</b> no se ha podido leer.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Tagging in the Mercurial repository</source> <translation>Haciendo tag en el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Created new branch <{0}>.</source> <translation>Creada nueva branch <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1133"/> <source>Current branch tip</source> <translation>Tip branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/> <source>Cancelling uncommitted merge</source> <translation>Cancelando merge sin commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3614"/> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> <source>Delete Bookmark</source> <translation>Borrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> <source>Select the bookmark to be deleted:</source> <translation>Seleccionar el marcador a borrar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/> <source>Delete Mercurial Bookmark</source> <translation>Borrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/> <source>Rename Mercurial Bookmark</source> <translation>Renombrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> <source>Move Mercurial Bookmark</source> <translation>Mover Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Pull Bookmark</source> <translation>Pull de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Select the bookmark to be pulled:</source> <translation>Seleccinar el marcador sobre el que hacer pull:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Haciendo pull de marcador desde un repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Push Bookmark</source> <translation>Push de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Select the bookmark to be push:</source> <translation>Seleccinar el marcador sobre el que hacer push:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3924"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Haciendo push de marcador desde un repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> <source>Re-Merge</source> <translation>Re-Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> <source>Do you really want to re-merge these files or directories?</source> <translation>¿Desea realmente hacer un re-merge de estos archivos o directorios?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> <source>Do you really want to re-merge the project?</source> <translation>¿Desea realmente hacer un re-merge del proyecto?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> <source>Re-Merging</source> <translation>Aplicando Re-Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/> <source>Marking as 'unresolved'</source> <translation>Marcando como 'unresolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> <source>Marking as 'resolved'</source> <translation>Marcando como 'resolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> <source>Delete All Backups</source> <translation>Borrar todas las Copias de Seguridad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation><p>¿Desea realmente borrar todos los bundles de copia de seguridad almacenados en el área de copias de seguridad <b>{0}</b>?</p></translation> </message> @@ -21871,7 +22009,7 @@ <context> <name>HgAddSubrepositoryDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="14"/> <source>Add Sub-repository</source> <translation>Añadir Sub-repositorio</translation> </message> @@ -23054,7 +23192,7 @@ <translation>Pulsar para marcar las entradas seleccionadas como 'resolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="73"/> <source>Resolved</source> <translation>Resolved</translation> </message> @@ -23064,7 +23202,7 @@ <translation>Pulsar para marcar las entradas seleccionadas como 'unresolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="83"/> <source>Unresolved</source> <translation>Unresolved</translation> </message> @@ -23657,7 +23795,7 @@ <translation>Seleccionar la categoría sobre la que filtrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="55"/> <source>Revision</source> <translation>Revisión</translation> </message> @@ -24029,7 +24167,7 @@ <translation><p>El archivo <b>{0}</b> no puede ser leído.</p><p>Causa: {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="14"/> <source>Edit Plan</source> <translation>Plan de Edición</translation> </message> @@ -24170,7 +24308,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="14"/> <source>Mercurial Log</source> <translation>Registro de Mercurial</translation> </message> @@ -24200,17 +24338,17 @@ <translation>Seleccione el campo de filtrado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="181"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="191"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="201"/> <source>Message</source> <translation>Mensaje</translation> </message> @@ -24220,127 +24358,127 @@ <translation>Fecha</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="285"/> <source>Action</source> <translation>Acción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="290"/> <source>Path</source> <translation>Ruta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="295"/> <source>Copy from</source> <translation>Copiar desde</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="306"/> <source>Press to get the next bunch of log entries</source> <translation>Pulse para recuperar el siguiente conjunto de entradas de log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="309"/> <source>&Next</source> <translation>Siguie&nte</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="316"/> <source>Enter the limit of entries to fetch</source> <translation>Introduzca el límite de entradas a recuperar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="335"/> <source>Select to stop listing log messages at a copy or move</source> <translation>Seleccione para detener el listado de mensajes de log de copy o move</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="338"/> <source>Stop on Copy/Move</source> <translation>Detener en copy/move</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="398"/> <source>Press to compare two revisions</source> <translation>Pulse para comparar dos revisiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="401"/> <source>&Compare Revisions</source> <translation>&Comparar Revisiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="462"/> <source>Errors</source> <translation>Errores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="468"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Errores de Mercurial log</b><p>Muestra los posibles mensajes de error del comando hg log.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="484"/> <source>Input</source> <translation>Input</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="474"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="506"/> <source>Press to send the input to the hg process</source> <translation>Pulsar para enviar el input al proceso de hg</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="477"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="509"/> <source>&Send</source> <translation>&Enviar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="512"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="519"/> <source>Enter data to be sent to the hg process</source> <translation>Introduzca los datos a enviar al proceso de hg</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="526"/> <source>Select to switch the input field to password mode</source> <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="529"/> <source>&Password Mode</source> <translation>&Modo de contraseña</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="532"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> <source>Added</source> <translation>Añadido</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169"/> <source>Deleted</source> <translation>Borrado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source>Modified</source> <translation>Modificado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="990"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="990"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -24355,17 +24493,17 @@ <translation>Tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="666"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="747"/> <source>The hg process did not finish within 30s.</source> <translation>El proceso hg no terminó en un plazo de 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="669"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="750"/> <source>Could not start the hg executable.</source> <translation>No se ha podido iniciar el ejecutable de hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="753"/> <source>Mercurial Error</source> <translation>Error de Mercurial</translation> </message> @@ -24375,22 +24513,22 @@ <translation>Gráficos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="378"/> <source>Press to generate a diff to the first parent revision</source> <translation>Pulse para generar un diff con la revisión primer padre</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="381"/> <source>Diff to Parent &1</source> <translation>Diff con el padre &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> <source>Press to generate a diff to the second parent revision</source> <translation>Pulse para generar un diff con la segunda revisión padre</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="391"/> <source>Diff to Parent &2</source> <translation>Diff con el padre &2</translation> </message> @@ -24405,32 +24543,32 @@ <translation>Seleccione la branch para filtrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="147"/> <source>All</source> <translation>Todo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> <source>Mercurial Log (Incoming)</source> <translation>Mercurial Log (Entrante)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="77"/> <source>Mercurial Log (Outgoing)</source> <translation>Mercurial Log (Saliente)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> <source>Bookmarks</source> <translation>Marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="90"/> <source>Press to refresh the list of changesets</source> <translation>Pulsar para actualizar la lista de changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> <source>&Refresh</source> <translation>Actualiza&r</translation> </message> @@ -24440,84 +24578,84 @@ <translation>Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> <source>Change the phase of the selected revisions</source> <translation>Cambiar la fase de las revisiones seleccionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="227"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation><b>Cambiar Fase</b> <p>Cambia la fase de las revisiones seleccionadas. Las revisiones seleccionadas deben tener la misma fase actual.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1898"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2090"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="444"/> <source>Select to show differences side-by-side</source> <translation>Seleccionar para mostrar diferencias lado a lado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> <source>Show differences side-by-side</source> <translation>Mostrar diferencias lado a lado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="421"/> <source>Select action from menu</source> <translation>Seleccionar acción del menú</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> <source>Copy the selected changesets to the current branch</source> <translation>Pulsar para copiar los changesets seleccionados a la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> - <source>Tag</source> - <translation>Aplicar Tag</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="204"/> - <source>Tag the selected revision</source> - <translation>Aplicar Tag a la revisión seleccionada</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1773"/> - <source>Switch</source> - <translation>Hacer switch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="209"/> - <source>Switch the working directory to the selected revision</source> - <translation>Hacer switch del directorio de trabajo a la revisión seleccionada</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/> + <source>Tag</source> + <translation>Aplicar Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="235"/> + <source>Tag the selected revision</source> + <translation>Aplicar Tag a la revisión seleccionada</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1950"/> + <source>Switch</source> + <translation>Hacer switch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="240"/> + <source>Switch the working directory to the selected revision</source> + <translation>Hacer switch del directorio de trabajo a la revisión seleccionada</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/> <source>Pull Large Files</source> <translation>Hacer pull de archivos grandes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="265"/> <source>Pull large files for selected revisions</source> <translation>Hacer pull de archivos grandes para revisiones seleccionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="983"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1084"/> <source>{0} (large file)</source> <translation>{0} (archivo grande)</translation> </message> @@ -24542,354 +24680,169 @@ <translation>Pulsar para encontrar la ocurrencia siguiente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Find</source> <translation>Buscar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Filter</source> <translation>Filtro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> - <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></source> - <translation><table><tr><td><b>Revisión</b></td><td>{0}</td></tr><tr><td><b>Fecha</b></td><td>{1}</td></tr><tr><td><b>Autor</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiquetas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2191"/> <source>Find Commit</source> <translation>Buscar Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2191"/> <source>'{0}' was not found.</source> <translation>'{0}' no se ha encontrado.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/> <source>File</source> <translation>Archivo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174"/> <source>Draft</source> <translation>Borrador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> <source>Public</source> <translation>Público</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/> <source>Secret</source> <translation>Secreto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2048"/> <source>Pull Changes</source> <translation>Hacer Pull de Cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="261"/> <source>Pull changes from a remote repository</source> <translation>Hacer pull de cambios desde un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="274"/> <source>Push Selected Changes</source> <translation>Hacer Pull de Cambios Seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation>Hacer push de cambios del changeset seleccionado y sus ancestores a un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> <source>Push All Changes</source> <translation>Hacer Push de Todos los Cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/> <source>Push all changes to a remote repository</source> <translation>Hacer push de todos los cambios a un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1852"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2029"/> <source>Fetch Changes</source> <translation>Fetch (recuperación) de cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2090"/> <source>Strip Changesets</source> <translation>Hacer strip de Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> <source>Fetch changes from a remote repository</source> <translation>Fetch (recuperación) de cambios desde un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="291"/> <source>Strip changesets from a repository</source> <translation>Hacer strip de changesets desde un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="245"/> <source>Define Bookmark...</source> <translation>Definir marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="248"/> <source>Bookmark the selected revision</source> <translation>Establecer marcador para la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250"/> <source>Move Bookmark...</source> <translation>Mover Marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253"/> <source>Move bookmark to the selected revision</source> <translation>Mover marcador a la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1971"/> <source>Define Bookmark</source> <translation>Definir Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1971"/> <source>Enter bookmark name for changeset "{0}":</source> <translation>Introducir nombre de marcador para el changeset "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1816"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1993"/> <source>Move Bookmark</source> <translation>Mover Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1816"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1993"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation>Seleccionar el marcador a mover al changeset "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1936"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation>Seleccionar marcador al que cambiar (dejar vacío para usar revisión):</translation> </message> -</context> -<context> - <name>HgLogDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="14"/> - <source>Mercurial Log</source> - <translation>Registro de Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="26"/> - <source>Log</source> - <translation>Registro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="32"/> - <source><b>Mercurial Log</b><p>This shows the output of the hg log command. By clicking on the links you may show the difference between revisions.</p></source> - <translation><b>Log de Mercurial</b><p>Muestra la salida del comando hg log. Haciendo click en los enlaces se muestran las diferencias entre versiones.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="61"/> - <source>Errors</source> - <translation>Errores</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="67"/> - <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> - <translation><b>Errores de Mercurial log</b><p>Muestra los posibles mensajes de error del comando hg log.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="83"/> - <source>Input</source> - <translation>Input</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="105"/> - <source>Press to send the input to the hg process</source> - <translation>Pulse para enviar el input al proceso de hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="108"/> - <source>&Send</source> - <translation>&Enviar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="111"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="118"/> - <source>Enter data to be sent to the hg process</source> - <translation>Introduzca los datos a enviar al proceso de hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="125"/> - <source>Select to switch the input field to password mode</source> - <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="128"/> - <source>&Password Mode</source> - <translation>&Modo de contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="131"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="64"/> - <source><b>Processing your request, please wait...</b></source> - <translation><b>Procesando la solicitud, por favor aguarde...</b></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="74"/> - <source>Revision</source> - <translation>Revisión</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> - <source>Process Generation Error</source> - <translation>Error de Generación de Proceso</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/> - <source>No log available for '{0}'</source> - <translation>No hay registros de log disponibles para '{0}'</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="344"/> - <source>diff to {0}</source> - <translation>diff con {0}</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="358"/> - <source>Tags: {0}<br /> -</source> - <translation>Tags: {0}<br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="364"/> - <source>Parents: {0}<br /> -</source> - <translation>Parents: {0}<br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="367"/> - <source><i>Author: {0}</i><br /> -</source> - <translation><i>Autor: {0}</i><br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="371"/> - <source><i>Date: {0}, {1}</i><br /> -</source> - <translation><i>Fecha: {0}</i><br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="387"/> - <source>Added {0}<br /> -</source> - <translation>Añadido {0}<br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="393"/> - <source>Modified {0}<br /> -</source> - <translation>Modificado {0}<br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="399"/> - <source>Deleted {0}<br /> -</source> - <translation>Borrado {0}<br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="270"/> - <source>The hg process did not finish within 30s.</source> - <translation>El proceso hg no terminó en un plazo de 30s.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> - <source>Could not start the hg executable.</source> - <translation>No se ha podido iniciar el ejecutable de hg.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="276"/> - <source>Mercurial Error</source> - <translation>Error de Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="382"/> - <source>Added {0} (copied from {1})<br /> -</source> - <translation>Añadido {0} (copiado de {1})<br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="361"/> - <source>Bookmarks: {0}<br /> -</source> - <translation>Marcadores: {0}<br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="352"/> - <source>Phase: {0}<br /> -</source> - <translation>Fase: {0}<br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="45"/> - <source>Select to show differences side-by-side</source> - <translation>Seleccionar para mostrar diferencias lado a lado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="48"/> - <source>Show differences side-by-side</source> - <translation>Mostrar diferencias lado a lado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="355"/> - <source>Branch: {0}<br /> -</source> - <translation>Branch: {0}<br /> -</translation> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr><tr><td><b>Children</b></td><td>{5}</td></tr>{6}</table></source> + <translation><table><tr><td><b>Revisión</b></td><td>{0}</td></tr><tr><td><b>Fecha</b></td><td>{1}</td></tr><tr><td><b>Autor</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <source>Press to move up in the log list</source> + <translation>Pulsar para mover hacia arriba en el listado de log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="368"/> + <source>Press to move down in the log list</source> + <translation>Pulsar para mover hacia abajo en el listado de log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> + <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Último Tag</b></td><td>{0}</td></tr></translation> </message> </context> <context> @@ -25252,87 +25205,82 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="605"/> <source>Version Control</source> <translation>Control de Versiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="617"/> <source>Commit changes to repository...</source> <translation>Hacer commit de los cambios al repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> <source>Add to repository</source> <translation>Añadir al repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628"/> <source>Remove from repository (and disk)</source> <translation>Eliminar del repositorio (y del disco)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="548"/> - <source>Show log</source> - <translation>Mostrar log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="552"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="544"/> <source>Show log browser</source> <translation>Mostrar navegador de log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="663"/> <source>Select all local file entries</source> <translation>Seleccionar todas las entradas de archivo locales</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="665"/> <source>Select all versioned file entries</source> <translation>Seleccionar todas las entradas de archivo versionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> <source>Select all local directory entries</source> <translation>Seleccionar todas las entradas de directorio locales</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="669"/> <source>Select all versioned directory entries</source> <translation>Seleccionar todas las entradas de directorio versionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> <source>Show status</source> <translation>Mostrar estado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="343"/> <source>Show annotated file</source> <translation>Mostrar archivo anotado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Remove from repository only</source> <translation>Eliminar solamente del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Do you really want to remove these files from the repository?</source> <translation>¿Realmente quiere eliminar estos archivos del repositorio?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="539"/> <source>Copy</source> <translation>Copiar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="541"/> <source>Move</source> <translation>Mover</translation> </message> @@ -25342,42 +25290,42 @@ <translation>Extensiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="639"/> <source>Show differences</source> <translation>Mostrar diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="329"/> <source>Show differences side-by-side</source> <translation>Mostrar diferencias lado a lado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="651"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="643"/> <source>Show differences (extended)</source> <translation>Mostrar diferencias (extendido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="338"/> <source>Show differences side-by-side (extended)</source> <translation>Mostrar diferencias lado a lado (extendido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="653"/> <source>Conflicts resolved</source> <translation>Conflictos resueltos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="656"/> <source>Conflicts unresolved</source> <translation>Conflictos sin resolver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659"/> <source>Re-Merge</source> <translation>Re-Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="672"/> <source>Configure...</source> <translation>Configurar...</translation> </message> @@ -25526,581 +25474,561 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> - <source>Show log</source> - <translation>Mostrar log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> - <source>Show &log</source> - <translation>Mostrar &log</translation> + <source>Show log browser</source> + <translation>Mostrar navegador de log</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> - <source>Show the log of the local project</source> - <translation>Mostrar el log del proyecto local</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation>Mostrar un diálogo para navegar el log del proyecto local</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> - <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation><b>Mostrar log</b><p>Muestra el log del proyecto local.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> - <source>Show log browser</source> - <translation>Mostrar navegador de log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>Mostrar un diálogo para navegar el log del proyecto local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Mostrar navegador de log</b><p>Muestra un diálogo para navegar el log del proyecto local. Al principio se muestra un número limitado de entradas. Se pueden recuperar más entradas despues.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show &difference</source> <translation>Mostrar &diferencia</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> <source>Show the difference of the local project to the repository</source> <translation>Muestra las diferencias entre el proyecto local y el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Muestra la diferencia de revisiones entre el proyecto local y el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> <source>Show heads</source> <translation>Mostrar heads</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Show the heads of the repository</source> <translation>Mostrar los heads del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Mostrar heads</b><p>Muestra los heads del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357"/> <source>Show parents</source> <translation>Mostrar parents</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Show the parents of the repository</source> <translation>Mostrar los parents del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Mostrar parents</b><p>Muestra los parents del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="371"/> <source>Show tip</source> <translation>Mostrar tip</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> <source>Show the tip of the repository</source> <translation>Mostrar el tip del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Mostrar tip</b><p>Muestra el tip del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> - <source>Merge</source> - <translation>Hacer merge</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> - <source>Mer&ge changes...</source> - <translation>Hacer mer&ge de los cambios...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> - <source>Merge changes of a revision into the local project</source> - <translation>Hacer merge de los cambios de una revision en el proyecto local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> - <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> - <translation><b>Merge</b><p>Hace un merge de los cambios de una revision en el proyecto local.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> - <source>Show status</source> - <translation>Mostrar estado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> - <source>Show the status of the local project</source> - <translation>Mostrar el estado del proyecto local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation><b>Mostrar estado</b><p>Muestra el estado del proyecto local.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> - <source>Revert changes</source> - <translation>Revertir cambios</translation> + <source>Merge</source> + <translation>Hacer merge</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> - <source>Re&vert changes</source> - <translation>Re&vertir cambios</translation> + <source>Mer&ge changes...</source> + <translation>Hacer mer&ge de los cambios...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> - <source>Revert all changes made to the local project</source> - <translation>Revertir todos los cambios hechos al proyecto local</translation> + <source>Merge changes of a revision into the local project</source> + <translation>Hacer merge de los cambios de una revision en el proyecto local</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> + <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> + <translation><b>Merge</b><p>Hace un merge de los cambios de una revision en el proyecto local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> + <source>Show status</source> + <translation>Mostrar estado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <source>Show the status of the local project</source> + <translation>Mostrar el estado del proyecto local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation><b>Mostrar estado</b><p>Muestra el estado del proyecto local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <source>Revert changes</source> + <translation>Revertir cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <source>Re&vert changes</source> + <translation>Re&vertir cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <source>Revert all changes made to the local project</source> + <translation>Revertir todos los cambios hechos al proyecto local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Revertir cambios</b><p>Revierte todos los cambios hechos al proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>Tag in repository</source> <translation>Crear un Tag en el repositorio</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <source>&Tag in repository...</source> + <translation>Crear un &Tag en el repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <source>Tag the local project in the repository</source> + <translation>Crea un tag del proyecto local en el repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> - <source>&Tag in repository...</source> - <translation>Crear un &Tag en el repositorio...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> - <source>Tag the local project in the repository</source> - <translation>Crea un tag del proyecto local en el repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags</source> <translation>Listar tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>List tags...</source> <translation>Listar tags...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> <source>List tags of the project</source> <translation>Lista los tags del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Listar tags</b><p>Lista los tags del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>List branches</source> <translation>Listar branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>List branches...</source> <translation>Listar branches...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> + <source>List branches of the project</source> + <translation>Lista las branches del proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create branch</source> + <translation>Crear branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create &branch...</source> + <translation>Crear &branch...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> - <source>List branches of the project</source> - <translation>Lista las branches del proyecto</translation> + <source>Create a new branch for the local project in the repository</source> + <translation>Crear una nueva branch para el proyecto local en el repositorio</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Create branch</source> - <translation>Crear branch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Create &branch...</source> - <translation>Crear &branch...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> - <source>Create a new branch for the local project in the repository</source> - <translation>Crear una nueva branch para el proyecto local en el repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Crear branch</b><p>Crea una nueva branch para el proyecto local en el repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> <source>Close branch</source> <translation>Cerrar branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> <source>Close the current branch of the local project</source> <translation>Cerrar la branch actual para el proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Cerrar branch</b><p>Cierra la branch actual del proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>Switch</source> <translation>Hacer switch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>S&witch...</source> <translation>Hacer s&witch...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <source>Switch the working directory to another revision</source> + <translation>Hacer switch del directorio de trabajo a otra revisión</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation><b>Hacer switch</b><p>Hace un switch del directorio de trabajo a otra revisión.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Cleanup</source> + <translation>Limpiar (cleanup)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Cleanu&p</source> + <translation>Lim&piar (cleanup)</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Switch the working directory to another revision</source> - <translation>Hacer switch del directorio de trabajo a otra revisión</translation> + <source>Cleanup the local project</source> + <translation>Limpiar (cleanup) el proyecto local</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> - <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> - <translation><b>Hacer switch</b><p>Hace un switch del directorio de trabajo a otra revisión.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source>Cleanup</source> - <translation>Limpiar (cleanup)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source>Cleanu&p</source> - <translation>Lim&piar (cleanup)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> - <source>Cleanup the local project</source> - <translation>Limpiar (cleanup) el proyecto local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Limpieza (cleanup)</b><p>Lleva a cabo un cleanup del proyecto local.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <source>Execute command</source> + <translation>Ejecutar comando</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <source>E&xecute command...</source> + <translation>E&jecutar comando...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <source>Execute an arbitrary Mercurial command</source> + <translation>Ejecuta un comando Mercurial arbitrario</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> + <translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando Mercurial arbitrario.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>Execute command</source> - <translation>Ejecutar comando</translation> + <source>Configure</source> + <translation>Configurar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>E&xecute command...</source> - <translation>E&jecutar comando...</translation> + <source>Configure...</source> + <translation>Configurar...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> - <source>Execute an arbitrary Mercurial command</source> - <translation>Ejecuta un comando Mercurial arbitrario</translation> + <source>Show the configuration dialog with the Mercurial page selected</source> + <translation>Mostrar el diálogo de configuración con la página de Mercurial seleccionada</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> - <translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando Mercurial arbitrario.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Configure</source> - <translation>Configurar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Configure...</source> - <translation>Configurar...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> - <source>Show the configuration dialog with the Mercurial page selected</source> - <translation>Mostrar el diálogo de configuración con la página de Mercurial seleccionada</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Configurar</b><p>Mostrar el diálogo de configuración con la página de Mercurial seleccionada.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths</source> <translation>Mostrar rutas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths...</source> <translation>Mostrar rutas...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <source>Show the aliases for remote repositories</source> <translation>Mostrar los alias para los repositorios remotos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Mostrar rutas</b><p>Muestra los alias para los repositorios remotos.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository</source> <translation>Verificar repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository...</source> <translation>Verificar repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> <source>Verify the integrity of the repository</source> <translation>Verificar la integridad del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Verificar repositorio</b><p>Verifica la integridad del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover</source> <translation>Recuperar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover...</source> <translation>Recuperar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> <source>Recover from an interrupted transaction</source> <translation>Recuperar de una transacción interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Recuperar</b><p>Recupera de una transacción interrumpida.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> <source>Create .hgignore</source> <translation>Crear .hgignore</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <source>Create a .hgignore file with default values</source> + <translation>Crear un archivo .hgignore con valores por defecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation><b>Crear .hgignore</b><p>Crea un archivo .hgignore con valores por defecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup</source> + <translation>Crear changegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup...</source> + <translation>Crear changegroup...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> - <source>Create a .hgignore file with default values</source> - <translation>Crear un archivo .hgignore con valores por defecto</translation> + <source>Create changegroup file collecting changesets</source> + <translation>Crea un archivo de changegroup recogiendo changesets</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1793"/> + <source>Apply changegroups</source> + <translation>Aplicar changegroups</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> + <source>Apply changegroups...</source> + <translation>Aplicar changegroups...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <source>Apply one or several changegroup files</source> + <translation>Aplicar uno o varios archivos de changegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <source>Changegroup Management</source> + <translation>Gestión de Chagegroup</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation><b>Crear .hgignore</b><p>Crea un archivo .hgignore con valores por defecto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> - <source>Create changegroup</source> - <translation>Crear changegroup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> - <source>Create changegroup...</source> - <translation>Crear changegroup...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> - <source>Create changegroup file collecting changesets</source> - <translation>Crea un archivo de changegroup recogiendo changesets</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1810"/> - <source>Apply changegroups</source> - <translation>Aplicar changegroups</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> - <source>Apply changegroups...</source> - <translation>Aplicar changegroups...</translation> + <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> + <translation><b>Crear changegroup</b><p>Crea un archivo de changegroup recogiendo los changeset seleccionados (hg bundle).</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> + <translation><b>Aplicar changegroups</b><p>Aplica uno o varios archivos de changegroup generados por la acción 'Crear changegroup' (hg unbundle).</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> + <source>Show current branch</source> + <translation>Mostrar la branch actual</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Show the current branch of the project</source> + <translation>Mostrar la branch actual del proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation><b>Mostrar branch actual</b><p>Muestra la branch actual del proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <source>Mark as "good"</source> + <translation>Marcar como "bueno"</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> - <source>Apply one or several changegroup files</source> - <translation>Aplicar uno o varios archivos de changegroup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1324"/> - <source>Changegroup Management</source> - <translation>Gestión de Chagegroup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> - <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> - <translation><b>Crear changegroup</b><p>Crea un archivo de changegroup recogiendo los changeset seleccionados (hg bundle).</p></translation> + <source>Mark a selectable changeset as good</source> + <translation>Marcar un changeset seleccionable como bueno</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> - <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> - <translation><b>Aplicar changegroups</b><p>Aplica uno o varios archivos de changegroup generados por la acción 'Crear changegroup' (hg unbundle).</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> - <source>Show current branch</source> - <translation>Mostrar la branch actual</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> - <source>Show the current branch of the project</source> - <translation>Mostrar la branch actual del proyecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation><b>Mostrar branch actual</b><p>Muestra la branch actual del proyecto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source>Mark as "good"</source> - <translation>Marcar como "bueno"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> - <source>Mark a selectable changeset as good</source> - <translation>Marcar un changeset seleccionable como bueno</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Marcar como bueno</b><p>Marca un changeset seleccionable como bueno.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source>Mark as "bad"</source> <translation>Marcar como "malo"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> <source>Mark a selectable changeset as bad</source> <translation>Marcar un changeset seleccionable como malo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Marcar como malo</b><p>Marca un changeset seleccionable como malo.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <source>Skip</source> <translation>Saltar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> <source>Reset</source> <translation>Reiniciar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> <source>Reset the bisect search data</source> <translation>Reiniciar los datos de búsqueda de bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Reiniciar</b><p>Reinicia los datos de búsqueda de bisect.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> <source>Mark as "good"...</source> <translation>Marcar como "bueno"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source>Mark as "bad"...</source> <translation>Marcar como "malo"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> <source>Preview changegroup...</source> <translation>Previsualizar changegroup...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify</source> <translation>Identificar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify...</source> <translation>Identificar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> <source>Identify the project directory</source> <translation>Identificar el directorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identificar</b><p>Identifica el directorio de proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Previsualizar un archivo de changegroup conteniendo una colección de changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Previsualizar changegroup</b><p>Previsualiza un archivo de changegroup conteniendo una colección de changesets.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> <source>Back out changeset</source> <translation>Hacer respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> <source>Back out changes of an earlier changeset</source> <translation>Hacer respaldo de cambios de un changeset anterior</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Hacer respaldo de changeset</b><p>Hace un respaldo de cambios de un changeset anterior.</p></translation> </message> @@ -26120,687 +26048,687 @@ <translation><b>Hacer push de cambios (force)</b><p>Se hace un push de los cambios desde el repositorio local a un repositorio remoto utilizando la opción 'force'.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1300"/> <source>Specials</source> <translation>Especial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> <source>Serve project repository</source> <translation>Servir repositorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> <source>Serve project repository...</source> <translation>Servir repositorio de proyecto...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Serve the project repository</source> <translation>Servir el repositorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Servir repositorio de proyecto</b><p>Esto sirve el repositorio de proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1627"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1610"/> <source>Pull</source> <translation>Hacer Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> <source>Push new branch</source> <translation>Hacer push de nueva rama</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Push the current branch of the local project as a new named branch</source> <translation>Ejecutar push de la rama actual del proyecto local como una nueva rama con nombre</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation><b>Hacer push de nueva rama</b><p>Hace un push de la rama actual del proyecto local como una nueva rama con nombre.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Rollback last transaction</source> <translation>Rollback de última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Rollback the last transaction</source> <translation>Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Extensions</source> <translation>Extensiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Edit user configuration</source> <translation>Editar configuración de usuario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Edit user configuration...</source> <translation>Editar configuración de usuario...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Show an editor to edit the user configuration file</source> <translation>Mostrar un editor para editar el archivo de configuración de usuario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation><b>Editar configuración de usuario</b><p>Mostrar un editor para editar el archivo de configuración de usuario.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration</source> + <translation>Editar configuración del repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration...</source> + <translation>Editar configuración del repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <source>Show an editor to edit the repository configuration file</source> + <translation>Mostrar un editor para editar el archivo de configuración del repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation><b>Editar configuración del repositorio</b><p>Mostrar un editor para editar el archivo de configuración del repositorio.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Edit repository configuration</source> - <translation>Editar configuración del repositorio</translation> + <source>Show combined configuration settings</source> + <translation>Mostrar ajustes de configuración combinados</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Edit repository configuration...</source> - <translation>Editar configuración del repositorio...</translation> + <source>Show combined configuration settings...</source> + <translation>Mostrar ajustes de configuración combinados...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> - <source>Show an editor to edit the repository configuration file</source> - <translation>Mostrar un editor para editar el archivo de configuración del repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation><b>Editar configuración del repositorio</b><p>Mostrar un editor para editar el archivo de configuración del repositorio.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <source>Show combined configuration settings</source> - <translation>Mostrar ajustes de configuración combinados</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <source>Show combined configuration settings...</source> - <translation>Mostrar ajustes de configuración combinados...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show the combined configuration settings from all configuration files</source> <translation>Mostrar los ajustes de configuración combinados de todos los archivos de configuración</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation><b>Mostrar ajustes de configuración combinados</b><p>Muestra los ajustes de configuración combinados de todos los archivos de configuración.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <source>Skip...</source> <translation>Ignorar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> <source>Skip a selectable changeset</source> <translation>Ignorar un changeset seleccionable</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation><b>Ignorar</b><p>Ignora un changeset seleccionable.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1849"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> <source>Import Patch...</source> <translation>Importar Patch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Import a patch from a patch file</source> <translation>Importar un patch desde un archivo de patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation><b>Importar Patch</b><p>Importa un patch desde un archivo de patch al proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1316"/> <source>Patch Management</source> <translation>Gestión de Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1869"/> <source>Revert Changes</source> <translation>Revertir cambios</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Export Patches</source> + <translation>Exportar Patches</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Export Patches...</source> + <translation>Exportar Patches...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <source>Export revisions to patch files</source> + <translation>Exportar revisiones a archivos de patch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation><b>Exportar Patches</b><p>Exporta revisiones del proyecto a archivos de patch.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> - <source>Export Patches</source> - <translation>Exportar Patches</translation> + <source>Change Phase</source> + <translation>Cambiar Fase</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> - <source>Export Patches...</source> - <translation>Exportar Patches...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> - <source>Export revisions to patch files</source> - <translation>Exportar revisiones a archivos de patch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation><b>Exportar Patches</b><p>Exporta revisiones del proyecto a archivos de patch.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> - <source>Change Phase</source> - <translation>Cambiar Fase</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase...</source> <translation>Cambiar Fase...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> + <source>Change the phase of revisions</source> + <translation>Cambiar la fase de revisiones</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation><b>Cambiar Fase</b><p>Cambia la fase de revisiones.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1889"/> + <source>Copy Changesets</source> + <translation>Copiar Changesets</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> - <source>Change the phase of revisions</source> - <translation>Cambiar la fase de revisiones</translation> + <source>Copies changesets from another branch</source> + <translation>Copiar changesets de otra branch</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> - <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> - <translation><b>Cambiar Fase</b><p>Cambia la fase de revisiones.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1906"/> - <source>Copy Changesets</source> - <translation>Copiar Changesets</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> - <source>Copies changesets from another branch</source> - <translation>Copiar changesets de otra branch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation><b>Copiar Changesets</b><p>Copia changesets de otra branch encima del directorio de trabajo actual con el usuario, fecha y descripción del changeset original.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> + <source>Continue Copying Session</source> + <translation>Continuar Sesión de Copia</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation>Continuar la última sesión de copia despues de resolver los conflictos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation><b>Continuar Sesión de Copia</b><p>Continua la última sesión de copia despues de resolver los conflictos.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/> + <source>Graft</source> + <translation>Graft</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <source>Copy Changesets (Continue)</source> + <translation>Copiar Changesets (Continuar)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Conflicts resolved</source> + <translation>Conflictos resueltos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Con&flicts resolved</source> + <translation>Con&flictos resueltos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation>Marcar todos los conflictos del proyecto local como resueltos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation><b>Conflictos resueltos</b><p>Marca todos los conflictos del proyecto local como resueltos.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> - <source>Continue Copying Session</source> - <translation>Continuar Sesión de Copia</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation>Continuar la última sesión de copia despues de resolver los conflictos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation><b>Continuar Sesión de Copia</b><p>Continua la última sesión de copia despues de resolver los conflictos.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1393"/> - <source>Graft</source> - <translation>Graft</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/> - <source>Copy Changesets (Continue)</source> - <translation>Copiar Changesets (Continuar)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Conflicts resolved</source> - <translation>Conflictos resueltos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Con&flicts resolved</source> - <translation>Con&flictos resueltos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation>Marcar todos los conflictos del proyecto local como resueltos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation><b>Conflictos resueltos</b><p>Marca todos los conflictos del proyecto local como resueltos.</p></translation> + <source>Add</source> + <translation>Añadir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <source>Add...</source> + <translation>Añadir...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <source>Add a sub-repository</source> + <translation>Añadir un sub-repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> + <translation><b>Añadir...</b><p>Añadir un sub-repositorio al proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> + <source>Remove</source> + <translation>Eliminar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Add</source> - <translation>Añadir</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Add...</source> - <translation>Añadir...</translation> + <source>Remove...</source> + <translation>Eliminar...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> - <source>Add a sub-repository</source> - <translation>Añadir un sub-repositorio</translation> + <source>Remove sub-repositories</source> + <translation>Eliminar sub-repositorios</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> - <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> - <translation><b>Añadir...</b><p>Añadir un sub-repositorio al proyecto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> - <source>Remove</source> - <translation>Eliminar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> - <source>Remove...</source> - <translation>Eliminar...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> - <source>Remove sub-repositories</source> - <translation>Eliminar sub-repositorios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation><b>Eliminar...</b><p>Eliminar sub-repositorios del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> <source>Sub-Repository</source> <translation>Sub-repositorio</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> + <source>Show &status...</source> + <translation>Mostrar e&stado...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <source>Show Summary</source> + <translation>Mostrar Sumario</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> - <source>Show &status...</source> - <translation>Mostrar e&stado...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> - <source>Show Summary</source> - <translation>Mostrar Sumario</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show summary...</source> <translation>Mostrar Sumario...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> <source>Show summary information of the working directory status</source> <translation>Mostrar información sumarial del estado del directorio de trabajo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation><b>Mostrar sumario</b><p>Muestra información sumarial del estado del directorio de trabajo.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create unversioned archive</source> <translation>Crear archivo sin versionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create unversioned archive...</source> <translation>Crear archivo sin versionar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> <source>Create an unversioned archive from the repository</source> <translation>Crear un archivo sin versionar a partir del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation><b>Crear archivo sin versionar...</b><p>Crea un archivo sin versionar a partir del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation><b>Rollback de última transacción</b><p>Lleva a cabo un rollback de la última transacción. Las transactiones se utilizan para encapsular los efectos de todos los comandos que crean nuevos changesets or propagan changesets existentes hacia un repository. Por ejemplo, los siguientes comandos son transaccionales, y sus efectos pueden ser revertidos (rollback):<ul><li>commit</li><li>import</li><li>pull</li><li>push (con este repositorio como destino)</li><li>unbundle</li></ul></p><p><strong>Este comando es peligroso. Utiliícelo por favor con cuidado.</strong></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/> <source>Administration</source> <translation>Administración</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show differences</source> <translation>Mostrar diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> <source>Show differences (extended)</source> <translation>Mostrar diferencias (extendido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation><b>Mostrar diferencias</b><p>Muestra diferencias entre el proyecto local y el repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation><b>Mostrar diferencias (extendido)</b><p>Muestra diferencias entre revisiones seleccionables del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> <source>Cancel uncommitted merge</source> <translation>Cancelar merge sin commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> <source>Cancel an uncommitted merge and lose all changes</source> <translation>Cancelar un merge sin commit y perder todos los cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> <translation><b>Cancelar merge sin commit</b><p>Esto cancela un merge sin commit causando que todos los cambios se pierdan.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <source>List bookmarks</source> + <translation>Listar marcadores</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <source>List bookmarks...</source> + <translation>Listar marcadores...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <source>List bookmarks of the project</source> + <translation>Lista marcadores del proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation><b>Listar marcadores</b><p>Lista los marcadores del proyecto.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>List bookmarks</source> - <translation>Listar marcadores</translation> + <source>Define bookmark</source> + <translation>Definir marcador</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>List bookmarks...</source> - <translation>Listar marcadores...</translation> + <source>Define bookmark...</source> + <translation>Definir marcador...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> - <source>List bookmarks of the project</source> - <translation>Lista marcadores del proyecto</translation> + <source>Define a bookmark for the project</source> + <translation>Define un marcador para el proyecto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation><b>Listar marcadores</b><p>Lista los marcadores del proyecto.</p></translation> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <translation><b>Definir marcador</b><p>Define un marcador para el proyecto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Define bookmark</source> - <translation>Definir marcador</translation> + <source>Delete bookmark</source> + <translation>Borrar marcador</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Define bookmark...</source> - <translation>Definir marcador...</translation> + <source>Delete bookmark...</source> + <translation>Borrar marcador...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> - <source>Define a bookmark for the project</source> - <translation>Define un marcador para el proyecto</translation> + <source>Delete a bookmark of the project</source> + <translation>Borrar un marcador del proyecto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation><b>Definir marcador</b><p>Define un marcador para el proyecto.</p></translation> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation><b>Borrar marcador</b><p>Borra un marcador del proyecto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Delete bookmark</source> - <translation>Borrar marcador</translation> + <source>Rename bookmark</source> + <translation>Renombrar marcador</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Delete bookmark...</source> - <translation>Borrar marcador...</translation> + <source>Rename bookmark...</source> + <translation>Renombrar marcador...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <source>Delete a bookmark of the project</source> - <translation>Borrar un marcador del proyecto</translation> + <source>Rename a bookmark of the project</source> + <translation>Renombrar un marcador del proyecto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation><b>Borrar marcador</b><p>Borra un marcador del proyecto.</p></translation> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation><b>Renombrar marcador</b><p>Renombra un marcador del proyecto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Rename bookmark</source> - <translation>Renombrar marcador</translation> + <source>Move bookmark</source> + <translation>Mover marcador</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Rename bookmark...</source> - <translation>Renombrar marcador...</translation> + <source>Move bookmark...</source> + <translation>Mover marcador...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> - <source>Rename a bookmark of the project</source> - <translation>Renombrar un marcador del proyecto</translation> + <source>Move a bookmark of the project</source> + <translation>Mover un marcador del proyecto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation><b>Renombrar marcador</b><p>Renombra un marcador del proyecto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source>Move bookmark</source> - <translation>Mover marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source>Move bookmark...</source> - <translation>Mover marcador...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> - <source>Move a bookmark of the project</source> - <translation>Mover un marcador del proyecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation><b>Mover marcador</b><p>Mueve un marcador del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1144"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> <source>Show incoming bookmarks</source> <translation>Mostrar marcadores entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Show a list of incoming bookmarks</source> <translation>Muestra una lista de marcadores entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation><b>Mostrar marcadores entrantes</b><p>Muestra una lista de nuevos marcadores disponibles en el repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Pull bookmark</source> <translation>Pull de marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> <source>Pull a bookmark from a remote repository</source> <translation>Hacer pull de marcador desde un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Hacer pull de marcador</b><p>Hace pull de un marcador desde un repositorio remoto al repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> <source>Show outgoing bookmarks</source> <translation>Mostrar marcadores salientes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> <source>Show a list of outgoing bookmarks</source> <translation>Muestra una lista de marcadores salientes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation><b>Mostrar marcadores salientes</b><p>Muestra una lista de nuevos marcadores disponibles en el repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/> <source>Push bookmark</source> <translation>Push de marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> <source>Push a bookmark to a remote repository</source> <translation>Hacer push de marcador a un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Hacer push de marcador</b><p>Hace push de un marcador desde un repositorio local al repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> <source>Bookmarks</source> <translation>Marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> <source>Branches</source> <translation>Branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>Re-Merge</source> <translation>Re-Merge</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <source>Re-Merge all conflicting, unresolved files of the project</source> + <translation>Aplicar Re-Merge a todos los archivos con conflictos sin resolver en el proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts</source> + <translation>Mostrar conflictos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts...</source> + <translation>Mostrar conflictos...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> - <source>Re-Merge all conflicting, unresolved files of the project</source> - <translation>Aplicar Re-Merge a todos los archivos con conflictos sin resolver en el proyecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Show conflicts</source> - <translation>Mostrar conflictos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Show conflicts...</source> - <translation>Mostrar conflictos...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> <source>Show a dialog listing all files with conflicts</source> <translation>Mostrar un diálogo listando todos los archivos con conflictos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> - <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> - <translation><b>Lista de Conflictos</b>\n<p>Muestra un listado de archivos que han tenido o tienen todavía conflictos.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> - <source>Conflicts unresolved</source> - <translation>Conflictos sin resolver</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> - <source>Mark all conflicts of the local project as unresolved</source> - <translation>Marcar todos los conflictos del proyecto local como sin resolver</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> - <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> - <translation><b>Conflictos sin resolver</b><p>Marca todos los conflictos del proyecto local como sin resolver.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> - <source>Manage Changes</source> - <translation>Gestionar Cambios</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> + <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> + <translation><b>Lista de Conflictos</b>\n<p>Muestra un listado de archivos que han tenido o tienen todavía conflictos.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> + <source>Conflicts unresolved</source> + <translation>Conflictos sin resolver</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <source>Mark all conflicts of the local project as unresolved</source> + <translation>Marcar todos los conflictos del proyecto local como sin resolver</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> + <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> + <translation><b>Conflictos sin resolver</b><p>Marca todos los conflictos del proyecto local como sin resolver.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> + <source>Manage Changes</source> + <translation>Gestionar Cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation><b>Re-Merge</b><p>Aplica un re-merge a todos los archivos con conflictos sin resolver del proyecto, descartando cualquier intento anterior de merge.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> <source>Pull current bookmark</source> <translation>Pull del marcador actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> <source>Pull the current bookmark from a remote repository</source> <translation>Hacer pull del marcador actual desde repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation><b>Pull de marcador actual<p>Ejecuta un pull del marcador actual desde un repositorio remoto al repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> <source>Push current bookmark</source> <translation>Push de marcador actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source>Push the current bookmark to a remote repository</source> <translation>Hacer push del marcador actual hacia repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation><b>Push de marcador actual<p>Ejecuta un pshl del marcador actual desde 3l repositorio local hacia un repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> <source>Delete all backups</source> <translation>Borrar todas las Copias de Seguridad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> <source>Delete all backup bundles stored in the backup area</source> <translation>Borrar todos los bundles de copia de seguridad almacenados en el área de copias de seguridad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation><b>Borrar todas las copias de seguridad</b><p>Borra todos los bundles de copia de seguridad almacenados en el área de copias de seguridad del repositorio.</p></translation> </message> @@ -28146,7 +28074,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="313"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="14"/> <source>Mercurial Status</source> <translation>Mercurial Status</translation> </message> @@ -28288,37 +28216,37 @@ <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="708"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="877"/> <source>There are no uncommitted changes available/selected.</source> <translation>No hay cambios pendientes de commit disponibles/seleccionados.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="772"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="775"/> <source>Add</source> <translation>Añadir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="772"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="775"/> <source>There are no unversioned entries available/selected.</source> <translation>No hay entradas sin versionar disponibles/seleccionadas.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="836"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="839"/> <source>Revert</source> <translation>Revertir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="798"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="836"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="839"/> <source>There are no missing entries available/selected.</source> <translation>No hay entradas perdidas disponibles/seleccionadas.</translation> </message> @@ -28403,17 +28331,17 @@ <translation>Restore sobre elementos perdidos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="582"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="585"/> <source>all</source> <translation>todo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="854"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="203"/> <source>Differences</source> <translation>Diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="708"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="711"/> <source>There are no entries selected to be committed.</source> <translation>No hay entradas seleccionadas sobre las que aplicar commit.</translation> </message> @@ -28443,12 +28371,12 @@ <translation>&Lado a Lado Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="881"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="884"/> <source>Side-by-Side Diff</source> <translation>Lado a Lado Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="881"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="884"/> <source>Only one file with uncommitted changes must be selected.</source> <translation>Se debe seleccionar solamente un archivo con cambios sin commit.</translation> </message> @@ -29678,7 +29606,7 @@ <translation>Pulse para eliminar las entradas seleccionadas</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/> + <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/> <source>&Remove</source> <translation>&Eliminar</translation> </message> @@ -29857,6 +29785,42 @@ </message> </context> <context> + <name>HtmlProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/HtmlProvider.py" line="388"/> + <source>Create List</source> + <translation>Crear Lista</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HtmlProvider.py" line="388"/> + <source>Enter desired number of list elements:</source> + <translation>Introducir número de elementos deseados en la lista:</translation> + </message> +</context> +<context> + <name>HyperlinkMarkupDialog</name> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="14"/> + <source>Insert Hyperlink</source> + <translation>Insertar Hiperenlace</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="23"/> + <source>Link Text:</source> + <translation>Texto del Enlace:</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="33"/> + <source>Link Target:</source> + <translation>Target del Enlace:</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="43"/> + <source>Link Title:</source> + <translation>Título del Enlace:</translation> + </message> +</context> +<context> <name>IExplorerImporter</name> <message> <location filename="../WebBrowser/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="40"/> @@ -30058,1065 +30022,1090 @@ <translation>Archivo de Bitmap de Windows (*.bmp)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="128"/> + <location filename="../IconEditor/IconEditorWindow.py" line="130"/> <source>Graphic Interchange Format File (*.gif)</source> <translation>Archivo de Formato Gráfico de Intercambio (*.gif)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="129"/> + <location filename="../IconEditor/IconEditorWindow.py" line="132"/> <source>Windows Icon File (*.ico)</source> <translation>Archivo de Icono de Windows (*.ico)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="130"/> + <location filename="../IconEditor/IconEditorWindow.py" line="134"/> <source>JPEG File (*.jpg)</source> <translation>Archivo JPEG (*.jpg)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="133"/> - <source>Portable Bitmap File (*.pbm)</source> - <translation>Archivo de Bitmap Portable (*.pbm)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="135"/> - <source>Portable Graymap File (*.pgm)</source> - <translation>Archivo de Portable Graymap (*.pgm)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="136"/> - <source>Portable Network Graphics File (*.png)</source> - <translation>Archivo Portable Network Graphics (*.png)</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="137"/> - <source>Portable Pixmap File (*.ppm)</source> - <translation>Archivo de Portable Pixmap (*.ppm)</translation> + <source>Portable Bitmap File (*.pbm)</source> + <translation>Archivo de Bitmap Portable (*.pbm)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="139"/> - <source>Scalable Vector Graphics File (*.svg)</source> - <translation>Archivo de Scalable Vector Graphics (*.svg)</translation> + <source>Portable Graymap File (*.pgm)</source> + <translation>Archivo de Portable Graymap (*.pgm)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="140"/> + <source>Portable Network Graphics File (*.png)</source> + <translation>Archivo Portable Network Graphics (*.png)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="141"/> + <source>Portable Pixmap File (*.ppm)</source> + <translation>Archivo de Portable Pixmap (*.ppm)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="143"/> - <source>TIFF File (*.tif)</source> - <translation>Archivo TIFF (*.tif)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="146"/> - <source>X11 Bitmap File (*.xbm)</source> - <translation>Archivo de X11 Bitmap (*.xbm)</translation> + <source>Scalable Vector Graphics File (*.svg)</source> + <translation>Archivo de Scalable Vector Graphics (*.svg)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="147"/> + <source>TIFF File (*.tif)</source> + <translation>Archivo TIFF (*.tif)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="151"/> + <source>X11 Bitmap File (*.xbm)</source> + <translation>Archivo de X11 Bitmap (*.xbm)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="152"/> <source>X11 Pixmap File (*.xpm)</source> <translation>Archivo de X11 Pixmap (*.xpm)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="158"/> + <location filename="../IconEditor/IconEditorWindow.py" line="163"/> <source>All Files (*)</source> <translation>Todos los Archivos</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>New</source> <translation>Nuevo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>&New</source> <translation>&Nuevo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>Ctrl+N</source> <comment>File|New</comment> <translation>Ctrl+N</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="196"/> + <location filename="../IconEditor/IconEditorWindow.py" line="201"/> <source>Create a new icon</source> <translation>Crear nuevo icono</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="197"/> + <location filename="../IconEditor/IconEditorWindow.py" line="202"/> <source><b>New</b><p>This creates a new icon.</p></source> <translation><b>Nuevo</b><p>Crea un icono nuevo.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="204"/> + <location filename="../IconEditor/IconEditorWindow.py" line="209"/> <source>New Window</source> <translation>Nueva Ventana</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="204"/> - <source>New &Window</source> - <translation>Nueva &Ventana</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="209"/> + <source>New &Window</source> + <translation>Nueva &Ventana</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="214"/> <source>Open a new icon editor window</source> <translation>Abrir una nueva ventana de editor de iconos</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="211"/> + <location filename="../IconEditor/IconEditorWindow.py" line="216"/> <source><b>New Window</b><p>This opens a new icon editor window.</p></source> <translation><b>Nueva Ventana</b><p>Abre una nueva ventana de editor de iconos.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>Open</source> <translation>Abrir</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>&Open...</source> <translation>&Abrir...</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>Ctrl+O</source> <comment>File|Open</comment> <translation>Ctrl+O</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="224"/> + <location filename="../IconEditor/IconEditorWindow.py" line="229"/> <source>Open an icon file for editing</source> <translation>Abre un archivo de icono para editar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="225"/> + <location filename="../IconEditor/IconEditorWindow.py" line="230"/> <source><b>Open File</b><p>This opens a new icon file for editing. It pops up a file selection dialog.</p></source> <translation><b>Abrir Archivo</b><p>Abre un nuevo archivo de icono para editar. Muestra un diálogo de selección de archivo.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>Save</source> <translation>Guardar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>&Save</source> <translation>&Guardar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>Ctrl+S</source> <comment>File|Save</comment> <translation>Ctrl+S</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="239"/> + <location filename="../IconEditor/IconEditorWindow.py" line="244"/> <source>Save the current icon</source> <translation>Guarda el icono actual</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="240"/> + <location filename="../IconEditor/IconEditorWindow.py" line="245"/> <source><b>Save File</b><p>Save the contents of the icon editor window.</p></source> <translation><b>Guardar archivo</b><p>Almacena el contenido de la ventana de edición de iconos.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Save As</source> <translation>Guardar como</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Save &As...</source> <translation>Guardar Co&mo...</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Shift+Ctrl+S</source> <comment>File|Save As</comment> <translation>Shift+Ctrl+S</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="253"/> + <location filename="../IconEditor/IconEditorWindow.py" line="258"/> <source>Save the current icon to a new file</source> <translation>Guarda el icono actual a un nuevo archivo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="255"/> + <location filename="../IconEditor/IconEditorWindow.py" line="260"/> <source><b>Save As...</b><p>Saves the current icon to a new file.</p></source> <translation><b>Guardar como</b><p>Guarda el icono actual en un nuevo archivo.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>Close</source> <translation>Cerrar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>&Close</source> <translation>&Cerrar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>Ctrl+W</source> <comment>File|Close</comment> <translation>Ctrl+W</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="268"/> + <location filename="../IconEditor/IconEditorWindow.py" line="273"/> <source>Close the current icon editor window</source> <translation>Cierra la ventana actual de edición de iconos</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="270"/> + <location filename="../IconEditor/IconEditorWindow.py" line="275"/> <source><b>Close</b><p>Closes the current icon editor window.</p></source> <translation><b>Cerrar</b><p>Cierra la ventana actual de edición de iconos.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="277"/> + <location filename="../IconEditor/IconEditorWindow.py" line="282"/> <source>Close All</source> <translation>Cerrar todo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="277"/> + <location filename="../IconEditor/IconEditorWindow.py" line="282"/> <source>Close &All</source> <translation>Cerrar &Todo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="281"/> + <location filename="../IconEditor/IconEditorWindow.py" line="286"/> <source>Close all icon editor windows</source> <translation>Cerrar todas las ventanas de edición de iconos</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="283"/> + <location filename="../IconEditor/IconEditorWindow.py" line="288"/> <source><b>Close All</b><p>Closes all icon editor windows except the first one.</p></source> <translation><b>Cerrar Todo</b><p>Cierra todas las ventanas de edición de iconos excepto la primera.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>Quit</source> <translation>Salir</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>&Quit</source> <translation>&Salir</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>Ctrl+Q</source> <comment>File|Quit</comment> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="309"/> + <location filename="../IconEditor/IconEditorWindow.py" line="314"/> <source>Quit the icon editor</source> <translation>Salir del editor de iconos</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="310"/> + <location filename="../IconEditor/IconEditorWindow.py" line="315"/> <source><b>Quit</b><p>Quit the icon editor.</p></source> <translation><b>Salir</b><p>Salir del editor de iconos.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Undo</source> <translation>Deshacer</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>&Undo</source> <translation>&Deshacer</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Ctrl+Z</source> <comment>Edit|Undo</comment> <translation>Ctrl+Z</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Alt+Backspace</source> <comment>Edit|Undo</comment> <translation>Alt+Backspace</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="329"/> + <location filename="../IconEditor/IconEditorWindow.py" line="334"/> <source>Undo the last change</source> <translation>Revierte el último cambio</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="330"/> + <location filename="../IconEditor/IconEditorWindow.py" line="335"/> <source><b>Undo</b><p>Undo the last change done.</p></source> <translation><b>Deshacer</b><p>Deshace el último cambio hecho en el editor.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>Redo</source> <translation>Rehacer</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>&Redo</source> <translation>&Rehacer</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>Ctrl+Shift+Z</source> <comment>Edit|Redo</comment> <translation>Ctrl+Shift+Z</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="343"/> + <location filename="../IconEditor/IconEditorWindow.py" line="348"/> <source>Redo the last change</source> <translation>Rehacer el último cambio</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="344"/> + <location filename="../IconEditor/IconEditorWindow.py" line="349"/> <source><b>Redo</b><p>Redo the last change done.</p></source> <translation><b>Rehacer</b><p>Rehace el último cambio hecho en el editor.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Cut</source> <translation>Cortar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Cu&t</source> <translation>Cor&tar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Ctrl+X</source> <comment>Edit|Cut</comment> <translation>Ctrl+X</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Shift+Del</source> <comment>Edit|Cut</comment> <translation>Shift+Del</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="358"/> + <location filename="../IconEditor/IconEditorWindow.py" line="363"/> <source>Cut the selection</source> <translation>Cortar la selección</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="359"/> + <location filename="../IconEditor/IconEditorWindow.py" line="364"/> <source><b>Cut</b><p>Cut the selected image area to the clipboard.</p></source> <translation><b>Cortar</b><p>Cortar la imagen seleccionada y la envía al portapapeles.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Copy</source> <translation>Copiar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>&Copy</source> <translation>&Copiar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Ctrl+C</source> <comment>Edit|Copy</comment> <translation>Ctrl+C</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Ctrl+Ins</source> <comment>Edit|Copy</comment> <translation>Ctrl+Ins</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="373"/> + <location filename="../IconEditor/IconEditorWindow.py" line="378"/> <source>Copy the selection</source> <translation>Copia la selección</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="374"/> + <location filename="../IconEditor/IconEditorWindow.py" line="379"/> <source><b>Copy</b><p>Copy the selected image area to the clipboard.</p></source> <translation><b>Copiar</b><p>Copiar la imagen seleccionada al portapapeles.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Paste</source> <translation>Pegar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>&Paste</source> <translation>&Pegar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Ctrl+V</source> <comment>Edit|Paste</comment> <translation>Ctrl+V</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Shift+Ins</source> <comment>Edit|Paste</comment> <translation>Shift+Ins</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="388"/> + <location filename="../IconEditor/IconEditorWindow.py" line="393"/> <source>Paste the clipboard image</source> <translation>PEgar la imagen en el portapapeles</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="389"/> + <location filename="../IconEditor/IconEditorWindow.py" line="394"/> <source><b>Paste</b><p>Paste the clipboard image.</p></source> <translation><b>Pegar</b><p>Pegar la imagen del portapapeles.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="396"/> + <location filename="../IconEditor/IconEditorWindow.py" line="401"/> <source>Paste as New</source> <translation>Pegar como Nuevo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="396"/> + <location filename="../IconEditor/IconEditorWindow.py" line="401"/> <source>Paste as &New</source> <translation>Pegar como &Nuevo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="400"/> + <location filename="../IconEditor/IconEditorWindow.py" line="405"/> <source>Paste the clipboard image replacing the current one</source> <translation>Pega la imagen del portapapeles reemplazando la imagen actual</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="402"/> + <location filename="../IconEditor/IconEditorWindow.py" line="407"/> <source><b>Paste as New</b><p>Paste the clipboard image replacing the current one.</p></source> <translation><b>Pegar como Nuevo</b><p>Pega la imagen del portapapeles reemplazando la imagen actual.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Clear</source> <translation>Limpiar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Cl&ear</source> <translation>&Limpiar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Alt+Shift+C</source> <comment>Edit|Clear</comment> <translation>Alt+Shift+C</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="416"/> + <location filename="../IconEditor/IconEditorWindow.py" line="421"/> <source>Clear the icon image</source> <translation>Limpiar la imagen de icono</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="417"/> + <location filename="../IconEditor/IconEditorWindow.py" line="422"/> <source><b>Clear</b><p>Clear the icon image and set it to be completely transparent.</p></source> <translation><b>Limpiar</b><p>Limpia la imagen del icono y la establece como completamente transparente.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>Select All</source> <translation>Seleccionar todo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>&Select All</source> <translation>Seleccionar &todo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>Ctrl+A</source> <comment>Edit|Select All</comment> <translation>Ctrl+A</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="431"/> + <location filename="../IconEditor/IconEditorWindow.py" line="436"/> <source>Select the complete icon image</source> <translation>Seleccionar imagen de icono completa</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="433"/> + <location filename="../IconEditor/IconEditorWindow.py" line="438"/> <source><b>Select All</b><p>Selects the complete icon image.</p></source> <translation><b>Seleccionar Todo</b><p>Selecciona la imagen de icono completa.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="440"/> + <location filename="../IconEditor/IconEditorWindow.py" line="445"/> <source>Change Size</source> <translation>Cambiar Tamaño</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="440"/> + <location filename="../IconEditor/IconEditorWindow.py" line="445"/> <source>Change Si&ze...</source> <translation>Cambiar &Tamaño...</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="446"/> + <location filename="../IconEditor/IconEditorWindow.py" line="451"/> <source>Change the icon size</source> <translation>Cambiar tamaño del icono</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="447"/> + <location filename="../IconEditor/IconEditorWindow.py" line="452"/> <source><b>Change Size...</b><p>Changes the icon size.</p></source> <translation><b>Cambiar Tamaño...</b><p>Cambia el tamaño del icono.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="454"/> + <location filename="../IconEditor/IconEditorWindow.py" line="459"/> <source>Grayscale</source> <translation>Escala de grises</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="454"/> + <location filename="../IconEditor/IconEditorWindow.py" line="459"/> <source>&Grayscale</source> <translation>Escala de &grises</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="460"/> + <location filename="../IconEditor/IconEditorWindow.py" line="465"/> <source>Change the icon to grayscale</source> <translation>Cambia el icono a escala de grises</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="462"/> + <location filename="../IconEditor/IconEditorWindow.py" line="467"/> <source><b>Grayscale</b><p>Changes the icon to grayscale.</p></source> <translation><b>Escala de Grises</b><p>Cambia el icono a escala de grises.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Zoom in</source> <translation>Aumentar zoom</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Zoom &in</source> <translation>A&umentar Zoom</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Ctrl++</source> <comment>View|Zoom in</comment> <translation>Ctrl++</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="497"/> + <location filename="../IconEditor/IconEditorWindow.py" line="502"/> <source>Zoom in on the icon</source> <translation>Aumentar zoom en el icono</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="498"/> + <location filename="../IconEditor/IconEditorWindow.py" line="503"/> <source><b>Zoom in</b><p>Zoom in on the icon. This makes the grid bigger.</p></source> <translation><b>Aumentar Zoom</b><p>Aumenta el zoom sobre el icono. Esto provoca que el grid sea mayor.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Zoom out</source> <translation>Disminuir Zoom</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Zoom &out</source> <translation>Dismi&nuir Zoom</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Ctrl+-</source> <comment>View|Zoom out</comment> <translation>Ctrl+-</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="511"/> + <location filename="../IconEditor/IconEditorWindow.py" line="516"/> <source>Zoom out on the icon</source> <translation>Disminuir zoom en el icono</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="512"/> + <location filename="../IconEditor/IconEditorWindow.py" line="517"/> <source><b>Zoom out</b><p>Zoom out on the icon. This makes the grid smaller.</p></source> <translation><b>Disminuir Zoom</b><p>Disminuir el zoom en el icono. Esto provoca que el grid sea menor.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Zoom reset</source> <translation>Restablecer zoom</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Zoom &reset</source> <translation>&Restablecer zoom</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Ctrl+0</source> <comment>View|Zoom reset</comment> <translation>Ctrl+0</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="535"/> + <location filename="../IconEditor/IconEditorWindow.py" line="540"/> <source>Show Grid</source> <translation>Mostrar Grid</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="535"/> + <location filename="../IconEditor/IconEditorWindow.py" line="540"/> <source>Show &Grid</source> <translation>Mostrar &Grid</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="541"/> + <location filename="../IconEditor/IconEditorWindow.py" line="546"/> <source>Toggle the display of the grid</source> <translation>Conmutar la visualización del grid</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="543"/> + <location filename="../IconEditor/IconEditorWindow.py" line="548"/> <source><b>Show Grid</b><p>Toggle the display of the grid.</p></source> <translation><b>Mostrar Grid</b><p>Conmuta la visualización del grid.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="562"/> + <location filename="../IconEditor/IconEditorWindow.py" line="567"/> <source>Freehand</source> <translation>Freehand</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="562"/> + <location filename="../IconEditor/IconEditorWindow.py" line="567"/> <source>&Freehand</source> <translation>&Freehand</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="568"/> + <location filename="../IconEditor/IconEditorWindow.py" line="573"/> <source><b>Free hand</b><p>Draws non linear lines.</p></source> <translation><b>Free hand</b><p>Dibuja formas no lineares.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="577"/> + <location filename="../IconEditor/IconEditorWindow.py" line="582"/> <source>Color Picker</source> <translation>Selector de Color</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="577"/> + <location filename="../IconEditor/IconEditorWindow.py" line="582"/> <source>&Color Picker</source> <translation>Selector de &Color</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="583"/> + <location filename="../IconEditor/IconEditorWindow.py" line="588"/> <source><b>Color Picker</b><p>The color of the pixel clicked on will become the current draw color.</p></source> <translation><b>Selector de Color</b><p>El color del pixel sobre el que se hace click pasa a ser el color actual de dibujo.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="594"/> + <location filename="../IconEditor/IconEditorWindow.py" line="599"/> <source>Rectangle</source> <translation>Rectángulo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="594"/> + <location filename="../IconEditor/IconEditorWindow.py" line="599"/> <source>&Rectangle</source> <translation>&Rectángulo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="600"/> + <location filename="../IconEditor/IconEditorWindow.py" line="605"/> <source><b>Rectangle</b><p>Draw a rectangle.</p></source> <translation><b>Rectángulo</b><p>Dibujar un rectángulo.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="609"/> + <location filename="../IconEditor/IconEditorWindow.py" line="614"/> <source>Filled Rectangle</source> <translation>Rectángulo Lleno</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="609"/> + <location filename="../IconEditor/IconEditorWindow.py" line="614"/> <source>F&illed Rectangle</source> <translation>Rectángulo &Lleno</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="615"/> + <location filename="../IconEditor/IconEditorWindow.py" line="620"/> <source><b>Filled Rectangle</b><p>Draw a filled rectangle.</p></source> <translation><b>Rectángulo Lleno</b><p>Dibujar un rectángulo lleno.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="625"/> + <location filename="../IconEditor/IconEditorWindow.py" line="630"/> <source>Circle</source> <translation>Círculo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="631"/> + <location filename="../IconEditor/IconEditorWindow.py" line="636"/> <source><b>Circle</b><p>Draw a circle.</p></source> <translation><b>Círculo</b><p>Dibujar un círculo.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="640"/> + <location filename="../IconEditor/IconEditorWindow.py" line="645"/> <source>Filled Circle</source> <translation>Círculo Lleno</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="640"/> + <location filename="../IconEditor/IconEditorWindow.py" line="645"/> <source>Fille&d Circle</source> <translation>Cí&rculo Lleno</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="646"/> + <location filename="../IconEditor/IconEditorWindow.py" line="651"/> <source><b>Filled Circle</b><p>Draw a filled circle.</p></source> <translation><b>Círculo Lleno</b><p>Dibujar un círculo lleno.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="656"/> + <location filename="../IconEditor/IconEditorWindow.py" line="661"/> <source>Ellipse</source> <translation>Elipse</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="656"/> + <location filename="../IconEditor/IconEditorWindow.py" line="661"/> <source>&Ellipse</source> <translation>&Elipse</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="662"/> + <location filename="../IconEditor/IconEditorWindow.py" line="667"/> <source><b>Ellipse</b><p>Draw an ellipse.</p></source> <translation><b>Elipse</b><p>Dibujar una elipse.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="671"/> + <location filename="../IconEditor/IconEditorWindow.py" line="676"/> <source>Filled Ellipse</source> <translation>Elipse Llena</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="671"/> + <location filename="../IconEditor/IconEditorWindow.py" line="676"/> <source>Fille&d Elli&pse</source> <translation>Eli&pse Llena</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="677"/> + <location filename="../IconEditor/IconEditorWindow.py" line="682"/> <source><b>Filled Ellipse</b><p>Draw a filled ellipse.</p></source> <translation><b>Elipse Llena</b><p>Dibujar una elipse llena.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="687"/> + <location filename="../IconEditor/IconEditorWindow.py" line="692"/> <source>Flood Fill</source> <translation>Flood Fill</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="687"/> + <location filename="../IconEditor/IconEditorWindow.py" line="692"/> <source>Fl&ood Fill</source> <translation>Fl&ood Fill</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="693"/> + <location filename="../IconEditor/IconEditorWindow.py" line="698"/> <source><b>Flood Fill</b><p>Fill adjoining pixels with the same color with the current color.</p></source> <translation><b>Flood Fill</b><p>Llenar píxeles adjuntos del mismo color con el color actual.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="703"/> + <location filename="../IconEditor/IconEditorWindow.py" line="708"/> <source>Line</source> <translation>Línea</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="703"/> + <location filename="../IconEditor/IconEditorWindow.py" line="708"/> <source>&Line</source> <translation>&Línea</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="709"/> + <location filename="../IconEditor/IconEditorWindow.py" line="714"/> <source><b>Line</b><p>Draw a line.</p></source> <translation><b>Línea</b><p>Dibujar una línea.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="718"/> + <location filename="../IconEditor/IconEditorWindow.py" line="723"/> <source>Eraser (Transparent)</source> <translation>Goma de Borrar (Transparente)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="718"/> + <location filename="../IconEditor/IconEditorWindow.py" line="723"/> <source>Eraser (&Transparent)</source> <translation>Goma de Borrar (&Transparente)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="724"/> + <location filename="../IconEditor/IconEditorWindow.py" line="729"/> <source><b>Eraser (Transparent)</b><p>Erase pixels by setting them to transparent.</p></source> <translation><b>Goma de Borrar (Transparente)</b><p>Borra píxeles estableciéndolos como transparentes.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="733"/> + <location filename="../IconEditor/IconEditorWindow.py" line="738"/> <source>Rectangular Selection</source> <translation>Selección Rectangular</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="750"/> + <location filename="../IconEditor/IconEditorWindow.py" line="755"/> <source>Rect&angular Selection</source> <translation>Selección Rect&angular</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="739"/> + <location filename="../IconEditor/IconEditorWindow.py" line="744"/> <source><b>Rectangular Selection</b><p>Select a rectangular section of the icon using the mouse.</p></source> <translation><b>Selección Rectangular</b><p>Seleccionar una sección rectangular del icono utilizando el ratón.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="750"/> + <location filename="../IconEditor/IconEditorWindow.py" line="755"/> <source>Circular Selection</source> <translation>Selección Circular</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="756"/> + <location filename="../IconEditor/IconEditorWindow.py" line="761"/> <source><b>Circular Selection</b><p>Select a circular section of the icon using the mouse.</p></source> <translation><b>Selección Circular</b><p>Seleccionar una sección circular del icono utilizando el ratón.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="773"/> + <location filename="../IconEditor/IconEditorWindow.py" line="778"/> <source>About</source> <translation>Acerca de</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="773"/> + <location filename="../IconEditor/IconEditorWindow.py" line="778"/> <source>&About</source> <translation>&Acerca de</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="777"/> + <location filename="../IconEditor/IconEditorWindow.py" line="782"/> <source>Display information about this software</source> <translation>Muestra información acerca de este software</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="779"/> + <location filename="../IconEditor/IconEditorWindow.py" line="784"/> <source><b>About</b><p>Display some information about this software.</p></source> <translation><b>Acerca de</b><p>Muestra información acerca de este software.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="785"/> + <location filename="../IconEditor/IconEditorWindow.py" line="790"/> <source>About Qt</source> <translation>Acerca de Qt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="785"/> + <location filename="../IconEditor/IconEditorWindow.py" line="790"/> <source>About &Qt</source> <translation>Acerca de &Qt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="789"/> + <location filename="../IconEditor/IconEditorWindow.py" line="794"/> <source>Display information about the Qt toolkit</source> <translation>Muestra información sobre las herramientas Qt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="791"/> + <location filename="../IconEditor/IconEditorWindow.py" line="796"/> <source><b>About Qt</b><p>Display some information about the Qt toolkit.</p></source> <translation><b>Acerca de Qt</b><p>Muestra información sobre las herramientas Qt.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>What's This?</source> <translation>¿Qué es esto?</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>&What's This?</source> <translation>¿&Qué es esto?</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>Shift+F1</source> <comment>Help|What's This?'</comment> <translation>Shift+F1</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="804"/> + <location filename="../IconEditor/IconEditorWindow.py" line="809"/> <source>Context sensitive help</source> <translation>Ayuda sensible al contexto</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="805"/> + <location filename="../IconEditor/IconEditorWindow.py" line="810"/> <source><b>Display context sensitive help</b><p>In What's This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.</p></source> <translation><b>Mostrar ayuda sensible al contexto</b><p>En modo ¿Qué es esto? el puntero del ratón muestra una flecha con un interrogante, y se puede hacer click en elementos de la interfaz gráfica para obtener una descripción corta de lo que hacen y de cómo se utilizan. En los diálogos, se puede acceder a esta característica utilizando el botón de ayuda de contexto en la barra de título.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="822"/> + <location filename="../IconEditor/IconEditorWindow.py" line="827"/> <source>&File</source> <translation>&Archivo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="839"/> + <location filename="../IconEditor/IconEditorWindow.py" line="844"/> <source>&Edit</source> <translation>&Editar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="855"/> + <location filename="../IconEditor/IconEditorWindow.py" line="860"/> <source>&View</source> <translation>&Ver</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="863"/> + <location filename="../IconEditor/IconEditorWindow.py" line="868"/> <source>&Tools</source> <translation>&Herramientas</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="882"/> + <location filename="../IconEditor/IconEditorWindow.py" line="887"/> <source>&Help</source> <translation>A&yuda</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="892"/> + <location filename="../IconEditor/IconEditorWindow.py" line="897"/> <source>File</source> <translation>Archivo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="906"/> + <location filename="../IconEditor/IconEditorWindow.py" line="911"/> <source>Edit</source> <translation>Editar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="919"/> - <source>View</source> - <translation>Ver</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="924"/> + <source>View</source> + <translation>Ver</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="929"/> <source>Tools</source> <translation>Herramientas</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="942"/> + <location filename="../IconEditor/IconEditorWindow.py" line="947"/> <source>Help</source> <translation>Ayuda</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="956"/> + <location filename="../IconEditor/IconEditorWindow.py" line="961"/> <source><p>This part of the status bar displays the icon size.</p></source> <translation><p>Esta zona de la barra de estado muestra el tamaño del icono.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="963"/> + <location filename="../IconEditor/IconEditorWindow.py" line="968"/> <source><p>This part of the status bar displays the cursor position.</p></source> <translation><p>Esta zona de la barra de estado muestra la posición del cursor.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1059"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1064"/> <source>Open icon file</source> <translation>Abrir archivo de icono</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1109"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1114"/> <source>Save icon file</source> <translation>Guardar archivo de icono</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1198"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1203"/> <source>Icon saved</source> <translation>Icono guardado</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1213"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1218"/> <source>Untitled</source> <translation>Sin título</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1217"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1222"/> <source>Icon Editor</source> <translation>Editor de Iconos</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="132"/> + <location filename="../IconEditor/IconEditorWindow.py" line="136"/> <source>Multiple-Image Network Graphics File (*.mng)</source> <translation>Archivo de Multiple-Image Network Graphics (*.mng)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="525"/> + <location filename="../IconEditor/IconEditorWindow.py" line="530"/> <source>Reset the zoom of the icon</source> <translation>Restablecer el zoom aplicado al icono</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="527"/> + <location filename="../IconEditor/IconEditorWindow.py" line="532"/> <source><b>Zoom reset</b><p>Reset the zoom of the icon. This sets the zoom factor to 100%.</p></source> <translation><b>Restablecer zoom</b><p>Restablece el zoom aplicado al icono. Establece el factor de zoom a 100%.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="134"/> - <source>Paintbrush Bitmap File (*.pcx)</source> - <translation>Archivo de Bitmap de Pincel (*.pcx)</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="138"/> - <source>Silicon Graphics Image File (*.sgi)</source> - <translation>Archivo de Silicon Graphics Image (*.sgi)</translation> + <source>Paintbrush Bitmap File (*.pcx)</source> + <translation>Archivo de Bitmap de Pincel (*.pcx)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="142"/> + <source>Silicon Graphics Image File (*.sgi)</source> + <translation>Archivo de Silicon Graphics Image (*.sgi)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="146"/> <source>Targa Graphic File (*.tga)</source> <translation>Archivo de Targa Graphic (*.tga)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1145"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1150"/> <source>The file '{0}' does not exist.</source> <translation>El archivo {0} no existe.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1152"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1157"/> <source>Cannot read file '{0}: {1}.</source> <translation>No se puede leer el archivo {0}: {1}.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1186"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1191"/> <source>Cannot write file '{0}: {1}.</source> <translation>No se puede guardar el archivo {0}: {1}.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1217"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1222"/> <source>{0}[*] - {1}</source> <translation>{0}[*] - {1}</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1109"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1114"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1238"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1243"/> <source>The icon image has unsaved changes.</source> <translation>La imagen de icono tiene cambios sin guardar.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="131"/> + <location filename="../IconEditor/IconEditorWindow.py" line="135"/> <source>JPEG File (*.jpeg)</source> <translation>Archivo JPEG (*.jpeg)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="140"/> - <source>Compressed Scalable Vector Graphics File (*.svgz)</source> - <translation>Archivo de Scalable Vector Graphics (*.svgz)</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="144"/> + <source>Compressed Scalable Vector Graphics File (*.svgz)</source> + <translation>Archivo de Scalable Vector Graphics (*.svgz)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="148"/> <source>TIFF File (*.tiff)</source> <translation>Archivo TIFF (*.tiff)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="145"/> + <location filename="../IconEditor/IconEditorWindow.py" line="149"/> <source>WAP Bitmap File (*.wbmp)</source> <translation>Archivo de Bitmap WAP(*.wbmp)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1238"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1243"/> <source>eric6 Icon Editor</source> <translation>Editor de Iconos de eric6</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1328"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1333"/> <source>About eric6 Icon Editor</source> <translation>Acerca del Editor de Iconos de eric6</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1328"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1333"/> <source>The eric6 Icon Editor is a simple editor component to perform icon drawing tasks.</source> <translation>El Editor de Iconos de eric6 es un componente de edición de iconos para llevar a cabo tareas de dibujado de iconos.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="290"/> + <location filename="../IconEditor/IconEditorWindow.py" line="295"/> <source>Close Others</source> <translation>Cerrar Otras</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="294"/> + <location filename="../IconEditor/IconEditorWindow.py" line="299"/> <source>Close all other icon editor windows</source> <translation>Cerrar todas las otras ventanas con editor de iconos</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="296"/> + <location filename="../IconEditor/IconEditorWindow.py" line="301"/> <source><b>Close Others</b><p>Closes all other icon editor windows.</p></source> <translation><b>Cerrar Otras</b><p>Cerrar todas las otras ventanas con editor de iconos.</p></translation> </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="150"/> + <source>WebP Image File (*.webp)</source> + <translation>Archivo de Imagen WebP (*.webp)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="128"/> + <source>Windows Cursor File (*.cur)</source> + <translation>Archivo de Cursor de Windows (*.cur)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="129"/> + <source>DirectDraw-Surface File (*.dds)</source> + <translation>Archivo de DirectDraw Surface(*.dds)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="131"/> + <source>Apple Icon File (*.icns)</source> + <translation>Archivo de Icono de Apple (*.icns)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="133"/> + <source>JPEG2000 File (*.jp2)</source> + <translation>Archivo JPEG2000 (*.jp2)</translation> + </message> </context> <context> <name>IconSizeDialog</name> @@ -31208,6 +31197,189 @@ </message> </context> <context> + <name>ImageMarkupDialog</name> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="53"/> + <source>Windows Bitmap File (*.bmp)</source> + <translation>Archivo de Bitmap de Windows (*.bmp)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="54"/> + <source>Windows Cursor File (*.cur)</source> + <translation>Archivo de Cursor de Windows (*.cur)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="55"/> + <source>DirectDraw-Surface File (*.dds)</source> + <translation>Archivo de DirectDraw Surface(*.dds)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="56"/> + <source>Graphic Interchange Format File (*.gif)</source> + <translation>Archivo de Formato Gráfico de Intercambio (*.gif)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="57"/> + <source>Apple Icon File (*.icns)</source> + <translation>Archivo de Icono de Apple (*.icns)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="58"/> + <source>Windows Icon File (*.ico)</source> + <translation>Archivo de Icono de Windows (*.ico)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="59"/> + <source>JPEG2000 File (*.jp2)</source> + <translation>Archivo JPEG2000 (*.jp2)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="60"/> + <source>JPEG File (*.jpg)</source> + <translation>Archivo JPEG (*.jpg)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="61"/> + <source>JPEG File (*.jpeg)</source> + <translation>Archivo JPEG (*.jpeg)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="62"/> + <source>Multiple-Image Network Graphics File (*.mng)</source> + <translation>Archivo de Multiple-Image Network Graphics (*.mng)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="63"/> + <source>Portable Bitmap File (*.pbm)</source> + <translation>Archivo de Bitmap Portable (*.pbm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="64"/> + <source>Paintbrush Bitmap File (*.pcx)</source> + <translation>Archivo de Bitmap de Pincel (*.pcx)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="65"/> + <source>Portable Graymap File (*.pgm)</source> + <translation>Archivo de Portable Graymap (*.pgm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="66"/> + <source>Portable Network Graphics File (*.png)</source> + <translation>Archivo Portable Network Graphics (*.png)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="67"/> + <source>Portable Pixmap File (*.ppm)</source> + <translation>Archivo de Portable Pixmap (*.ppm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="68"/> + <source>Silicon Graphics Image File (*.sgi)</source> + <translation>Archivo de Silicon Graphics Image (*.sgi)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="69"/> + <source>Scalable Vector Graphics File (*.svg)</source> + <translation>Archivo de Scalable Vector Graphics (*.svg)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="70"/> + <source>Compressed Scalable Vector Graphics File (*.svgz)</source> + <translation>Archivo Comprimido de Scalable Vector Graphics (*.svgz)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="72"/> + <source>Targa Graphic File (*.tga)</source> + <translation>Archivo de Targa Graphic (*.tga)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="73"/> + <source>TIFF File (*.tif)</source> + <translation>Archivo TIFF (*.tif)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="74"/> + <source>TIFF File (*.tiff)</source> + <translation>Archivo TIFF (*.tiff)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="75"/> + <source>WAP Bitmap File (*.wbmp)</source> + <translation>Archivo de Bitmap WAP(*.wbmp)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="76"/> + <source>WebP Image File (*.webp)</source> + <translation>Archivo de Imagen WebP (*.webp)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="77"/> + <source>X11 Bitmap File (*.xbm)</source> + <translation>Archivo de X11 Bitmap (*.xbm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="78"/> + <source>X11 Pixmap File (*.xpm)</source> + <translation>Archivo de X11 Pixmap (*.xpm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="89"/> + <source>All Files (*)</source> + <translation>Todos los Archivos (*)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="14"/> + <source>Add Image</source> + <translation>Añadir Imagen</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="25"/> + <source>Image Address:</source> + <translation>Dirección de la Imagen:</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="41"/> + <source>Enter the image path or URL</source> + <translation>Introducir la ruta o la URL de la imagen</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="48"/> + <source>Title:</source> + <translation>Título:</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="58"/> + <source>Alternative Text:</source> + <translation>Texto Alternativo:</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="73"/> + <source>Keep Original Size</source> + <translation>Mantener Tamaño Original</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="80"/> + <source>Keep Aspect Ratio</source> + <translation>Mantener Proporciones</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="89"/> + <source>Width:</source> + <translation>Anchura:</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="119"/> + <source> px</source> + <translation> px</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="109"/> + <source>Height:</source> + <translation>Altura:</translation> + </message> +</context> +<context> <name>ImagesIcon</name> <message> <location filename="../WebBrowser/StatusBar/ImagesIcon.py" line="40"/> @@ -34072,7 +34244,7 @@ <translation>Seleccione el análizador léxico alternativo al que asociar</translation> </message> <message> - <location filename="../Project/LexerAssociationDialog.py" line="131"/> + <location filename="../Project/LexerAssociationDialog.py" line="134"/> <source>Alternative</source> <translation>Alternativo</translation> </message> @@ -34408,317 +34580,317 @@ <translation>Makefile</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="117"/> + <location filename="../QScintilla/Lexers/__init__.py" line="121"/> <source>Perl</source> <translation>Perl</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="121"/> + <location filename="../QScintilla/Lexers/__init__.py" line="125"/> <source>Povray</source> <translation>Povray</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="123"/> + <location filename="../QScintilla/Lexers/__init__.py" line="127"/> <source>Properties</source> <translation>Propiedades</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="131"/> + <location filename="../QScintilla/Lexers/__init__.py" line="135"/> <source>Ruby</source> <translation>Ruby</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="133"/> - <source>SQL</source> - <translation>SQL</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="137"/> + <source>SQL</source> + <translation>SQL</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="141"/> <source>TeX</source> <translation>TeX</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="139"/> + <location filename="../QScintilla/Lexers/__init__.py" line="143"/> <source>VHDL</source> <translation>VHDL</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="547"/> + <location filename="../QScintilla/Lexers/__init__.py" line="565"/> <source>Pyrex Files (*.pyx)</source> <translation>Archivos Pyrex(*.pyx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="550"/> - <source>Quixote Template Files (*.ptl)</source> - <translation>Archivos de Plantilla Quixote (*.ptl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="553"/> - <source>Ruby Files (*.rb)</source> - <translation>Archivos Ruby (*.rb)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="556"/> - <source>IDL Files (*.idl)</source> - <translation>Archivos IDL (*.idl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="383"/> - <source>C Files (*.h *.c)</source> - <translation>Archivos C (*.h *.c)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="386"/> - <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> - <translation>Archivos C++ (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="568"/> + <source>Quixote Template Files (*.ptl)</source> + <translation>Archivos de Plantilla Quixote (*.ptl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="571"/> + <source>Ruby Files (*.rb)</source> + <translation>Archivos Ruby (*.rb)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="574"/> + <source>IDL Files (*.idl)</source> + <translation>Archivos IDL (*.idl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="393"/> + <source>C Files (*.h *.c)</source> + <translation>Archivos C (*.h *.c)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="396"/> + <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> + <translation>Archivos C++ (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="586"/> <source>C# Files (*.cs)</source> <translation>Archivos C# (*.cs)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="392"/> + <location filename="../QScintilla/Lexers/__init__.py" line="402"/> <source>HTML Files (*.html *.htm *.asp *.shtml)</source> <translation>Archivos HTML (*.html *.htm *.asp *.shtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="580"/> + <location filename="../QScintilla/Lexers/__init__.py" line="598"/> <source>CSS Files (*.css)</source> <translation>Archivos CSS (*.css)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="583"/> + <location filename="../QScintilla/Lexers/__init__.py" line="601"/> <source>QSS Files (*.qss)</source> <translation>Archivos QSS (*.qss)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="401"/> + <location filename="../QScintilla/Lexers/__init__.py" line="411"/> <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> <translation>Archivos PHP (*.php *.php3 *.php4 *.php5 *.phtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="595"/> - <source>Qt Resource Files (*.qrc)</source> - <translation>Archivos de Recursos Qt (*.qrc)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="410"/> - <source>D Files (*.d *.di)</source> - <translation>Archivos D (*.d *.di)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="604"/> - <source>Java Files (*.java)</source> - <translation>Archivos Java (*.java)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="607"/> - <source>JavaScript Files (*.js)</source> - <translation>Archivos JavaScript (*.js)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="610"/> - <source>SQL Files (*.sql)</source> - <translation>Archivos SQL (*.sql)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="613"/> - <source>Docbook Files (*.docbook)</source> - <translation>Archivos DocBook (*.docbook)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="425"/> - <source>Perl Files (*.pl *.pm *.ph)</source> - <translation>Archivos Perl (*.pl *.pm *.ph)</translation> + <source>Qt Resource Files (*.qrc)</source> + <translation>Archivos de Recursos Qt (*.qrc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="420"/> + <source>D Files (*.d *.di)</source> + <translation>Archivos D (*.d *.di)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="622"/> - <source>Lua Files (*.lua)</source> - <translation>Archivos Lua (^.lua)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="431"/> - <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> - <translation>Archivos TeX (*.tex *.sty *.aux *.toc *.idx)</translation> + <source>Java Files (*.java)</source> + <translation>Archivos Java (*.java)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="625"/> + <source>JavaScript Files (*.js)</source> + <translation>Archivos JavaScript (*.js)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="628"/> + <source>SQL Files (*.sql)</source> + <translation>Archivos SQL (*.sql)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="631"/> + <source>Docbook Files (*.docbook)</source> + <translation>Archivos DocBook (*.docbook)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="435"/> + <source>Perl Files (*.pl *.pm *.ph)</source> + <translation>Archivos Perl (*.pl *.pm *.ph)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="640"/> + <source>Lua Files (*.lua)</source> + <translation>Archivos Lua (^.lua)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="441"/> + <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> + <translation>Archivos TeX (*.tex *.sty *.aux *.toc *.idx)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="643"/> <source>Shell Files (*.sh)</source> <translation>Archivos Shell (*.sh)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="437"/> + <location filename="../QScintilla/Lexers/__init__.py" line="447"/> <source>Batch Files (*.bat *.cmd)</source> <translation>Archivos Batch (*.bat *.cmd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="440"/> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> <source>Diff Files (*.diff *.patch)</source> <translation>Archivos Diff (*.diff *.patch)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="443"/> - <source>Makefiles (*.mak)</source> - <translation>Makefiles (*.mak)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="446"/> - <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> - <translation>Archivos de Propiedades (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="649"/> - <source>Povray Files (*.pov)</source> - <translation>Archivos Povray (*.pov)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="453"/> - <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> - <translation>Archivos CMake (CMakeLists.txt *.cmake *.ctest)</translation> + <source>Makefiles (*.mak)</source> + <translation>Makefiles (*.mak)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="456"/> + <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> + <translation>Archivos de Propiedades (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="667"/> + <source>Povray Files (*.pov)</source> + <translation>Archivos Povray (*.pov)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="463"/> + <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> + <translation>Archivos CMake (CMakeLists.txt *.cmake *.ctest)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="466"/> <source>VHDL Files (*.vhd *.vhdl)</source> <translation>Archivos VHDL (*.vhd *.vhdl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="718"/> + <location filename="../QScintilla/Lexers/__init__.py" line="744"/> <source>All Files (*)</source> <translation>Todos los archivos (*)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="135"/> + <location filename="../QScintilla/Lexers/__init__.py" line="139"/> <source>TCL</source> <translation>TCL</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="459"/> + <location filename="../QScintilla/Lexers/__init__.py" line="469"/> <source>TCL/Tk Files (*.tcl *.tk)</source> <translation>Archivos TCL/Tk (*.tcl *.tk)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="559"/> - <source>C Files (*.c)</source> - <translation>Archivos C (*.c)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="562"/> - <source>C++ Files (*.cpp)</source> - <translation>Archivos C++ (*.cpp)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="565"/> - <source>C++/C Header Files (*.h)</source> - <translation>Archivos de cabecera C++ (*.h )</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="571"/> - <source>HTML Files (*.html)</source> - <translation>Archivos HTML (*.html)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="574"/> - <source>PHP Files (*.php)</source> - <translation>Archivos PHP (*.php)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="577"/> - <source>ASP Files (*.asp)</source> - <translation>Archivos ASP (*.asp)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="586"/> - <source>XML Files (*.xml)</source> - <translation>Archivos XML (*.xml)</translation> + <source>C Files (*.c)</source> + <translation>Archivos C (*.c)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="580"/> + <source>C++ Files (*.cpp)</source> + <translation>Archivos C++ (*.cpp)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="583"/> + <source>C++/C Header Files (*.h)</source> + <translation>Archivos de cabecera C++ (*.h )</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="589"/> - <source>XSL Files (*.xsl)</source> - <translation>Archivos XSL (*.xsl)</translation> + <source>HTML Files (*.html)</source> + <translation>Archivos HTML (*.html)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="592"/> + <source>PHP Files (*.php)</source> + <translation>Archivos PHP (*.php)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="595"/> + <source>ASP Files (*.asp)</source> + <translation>Archivos ASP (*.asp)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="604"/> + <source>XML Files (*.xml)</source> + <translation>Archivos XML (*.xml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="607"/> + <source>XSL Files (*.xsl)</source> + <translation>Archivos XSL (*.xsl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="610"/> <source>DTD Files (*.dtd)</source> <translation>Archivos DTD (*.dtd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="598"/> - <source>D Files (*.d)</source> - <translation>Archivos D (*.d)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="601"/> - <source>D Interface Files (*.di)</source> - <translation>Archivos de interfaces D (*.di)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="616"/> - <source>Perl Files (*.pl)</source> - <translation>Archivos Perl (*.pl)</translation> + <source>D Files (*.d)</source> + <translation>Archivos D (*.d)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="619"/> - <source>Perl Module Files (*.pm)</source> - <translation>Archivos de módulo Perl (*.pm)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="628"/> - <source>Batch Files (*.bat)</source> - <translation>Archivos Batch (*.bat)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="631"/> - <source>TeX Files (*.tex)</source> - <translation>Archivos TeX (*.tex)</translation> + <source>D Interface Files (*.di)</source> + <translation>Archivos de interfaces D (*.di)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="634"/> - <source>TeX Template Files (*.sty)</source> - <translation>Archivos de plantilla TeX (*.sty)</translation> + <source>Perl Files (*.pl)</source> + <translation>Archivos Perl (*.pl)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="637"/> - <source>Diff Files (*.diff)</source> - <translation>Archivos Diff (*.diff)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="640"/> - <source>Make Files (*.mak)</source> - <translation>Archivos Make (*.mak)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="643"/> - <source>Properties Files (*.ini)</source> - <translation>Archivos de Propiedades (*.ini)</translation> + <source>Perl Module Files (*.pm)</source> + <translation>Archivos de módulo Perl (*.pm)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="646"/> - <source>Configuration Files (*.cfg)</source> - <translation>Archivos de Configuración (*.cfg)</translation> + <source>Batch Files (*.bat)</source> + <translation>Archivos Batch (*.bat)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="649"/> + <source>TeX Files (*.tex)</source> + <translation>Archivos TeX (*.tex)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="652"/> - <source>CMake Files (CMakeLists.txt)</source> - <translation>Archivos CMake (CMakeLists.txt)</translation> + <source>TeX Template Files (*.sty)</source> + <translation>Archivos de plantilla TeX (*.sty)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="655"/> - <source>CMake Macro Files (*.cmake)</source> - <translation>Archivos de Macro CMake (*.cmake)</translation> + <source>Diff Files (*.diff)</source> + <translation>Archivos Diff (*.diff)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="658"/> - <source>VHDL Files (*.vhd)</source> - <translation>Archivos VHDL (*.vhd)</translation> + <source>Make Files (*.mak)</source> + <translation>Archivos Make (*.mak)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="661"/> - <source>TCL Files (*.tcl)</source> - <translation>Archivos TCL (*.tcl)</translation> + <source>Properties Files (*.ini)</source> + <translation>Archivos de Propiedades (*.ini)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="664"/> + <source>Configuration Files (*.cfg)</source> + <translation>Archivos de Configuración (*.cfg)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="670"/> + <source>CMake Files (CMakeLists.txt)</source> + <translation>Archivos CMake (CMakeLists.txt)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="673"/> + <source>CMake Macro Files (*.cmake)</source> + <translation>Archivos de Macro CMake (*.cmake)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="676"/> + <source>VHDL Files (*.vhd)</source> + <translation>Archivos VHDL (*.vhd)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="679"/> + <source>TCL Files (*.tcl)</source> + <translation>Archivos TCL (*.tcl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="682"/> <source>Tk Files (*.tk)</source> <translation>Archivos Tk (*.tk)</translation> </message> @@ -34733,175 +34905,195 @@ <translation>Fortran77</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="115"/> + <location filename="../QScintilla/Lexers/__init__.py" line="119"/> <source>Pascal</source> <translation>Pascal</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="119"/> + <location filename="../QScintilla/Lexers/__init__.py" line="123"/> <source>PostScript</source> <translation>PostScript</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="141"/> + <location filename="../QScintilla/Lexers/__init__.py" line="145"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="143"/> + <location filename="../QScintilla/Lexers/__init__.py" line="147"/> <source>YAML</source> <translation>YAML</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="404"/> + <location filename="../QScintilla/Lexers/__init__.py" line="414"/> <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> <translation>Archivos XML (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="462"/> + <location filename="../QScintilla/Lexers/__init__.py" line="472"/> <source>Fortran Files (*.f90 *.f95 *.f2k)</source> <translation>Archivos Fortran (*.f90 *.f95 *.f2k)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="465"/> + <location filename="../QScintilla/Lexers/__init__.py" line="475"/> <source>Fortran77 Files (*.f *.for)</source> <translation>Archivos Fortran77 (*.f *.for)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="468"/> + <location filename="../QScintilla/Lexers/__init__.py" line="478"/> <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> <translation>Archivos Pascal (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="676"/> + <location filename="../QScintilla/Lexers/__init__.py" line="694"/> <source>PostScript Files (*.ps)</source> <translation>Archivos PostScript (*.ps)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="474"/> + <location filename="../QScintilla/Lexers/__init__.py" line="484"/> <source>YAML Files (*.yaml *.yml)</source> <translation>Archivos YAML (*.yaml *.yml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="667"/> - <source>Fortran Files (*.f95)</source> - <translation>Archivos Fortran (*.f95)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="670"/> - <source>Fortran77 Files (*.f)</source> - <translation>Archivos Fortran77 (*.f)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="673"/> - <source>Pascal Files (*.pas)</source> - <translation>Archivos Pascal (*.pas)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="679"/> - <source>YAML Files (*.yml)</source> - <translation>Archivos YAML (*.yml)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="171"/> - <source>Pygments</source> - <translation>Pygments</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="365"/> - <source>Python Files (*.py *.py2 *.py3)</source> - <translation>Archivos Python (*.py *.py2 *.py3)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="368"/> - <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> - <translation>Archivos de GUI Python (*.pyw *.pyw2 *.pyw3)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="538"/> - <source>Python3 Files (*.py)</source> - <translation>Archivos Python (*.py3)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="544"/> - <source>Python3 GUI Files (*.pyw)</source> - <translation>Archivos de GUI Python3 (*.pyw)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="535"/> - <source>Python2 Files (*.py2)</source> - <translation>Archivos Python2 (*.py2)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="541"/> - <source>Python2 GUI Files (*.pyw2)</source> - <translation>Archivos de GUI Python2 (*.pyw2)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="125"/> - <source>Python2</source> - <translation>Python2</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="127"/> - <source>Python3</source> - <translation>Python3</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="148"/> - <source>Matlab</source> - <translation>Matlab</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="148"/> - <source>Octave</source> - <translation>Octave</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="480"/> - <source>Matlab Files (*.m *.m.matlab)</source> - <translation>Archivos Matlab (*.m *.m.matlab)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="685"/> - <source>Matlab Files (*.m)</source> - <translation>Archivos Matlab (*.m)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="685"/> - <source>Octave Files (*.m.octave)</source> - <translation>Archivos Octave (*.m.octave)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="480"/> - <source>Octave Files (*.m *.m.octave)</source> - <translation>Archivos Octave (*.m *.m.octave)</translation> + <source>Fortran Files (*.f95)</source> + <translation>Archivos Fortran (*.f95)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="688"/> + <source>Fortran77 Files (*.f)</source> + <translation>Archivos Fortran77 (*.f)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="691"/> + <source>Pascal Files (*.pas)</source> + <translation>Archivos Pascal (*.pas)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="697"/> + <source>YAML Files (*.yml)</source> + <translation>Archivos YAML (*.yml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="175"/> + <source>Pygments</source> + <translation>Pygments</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="375"/> + <source>Python Files (*.py *.py2 *.py3)</source> + <translation>Archivos Python (*.py *.py2 *.py3)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="378"/> + <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> + <translation>Archivos de GUI Python (*.pyw *.pyw2 *.pyw3)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="556"/> + <source>Python3 Files (*.py)</source> + <translation>Archivos Python (*.py3)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="562"/> + <source>Python3 GUI Files (*.pyw)</source> + <translation>Archivos de GUI Python3 (*.pyw)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="553"/> + <source>Python2 Files (*.py2)</source> + <translation>Archivos Python2 (*.py2)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="559"/> + <source>Python2 GUI Files (*.pyw2)</source> + <translation>Archivos de GUI Python2 (*.pyw2)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="129"/> + <source>Python2</source> + <translation>Python2</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="131"/> + <source>Python3</source> + <translation>Python3</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="115"/> + <source>Matlab</source> + <translation>Matlab</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="117"/> + <source>Octave</source> + <translation>Octave</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="487"/> + <source>Matlab Files (*.m *.m.matlab)</source> + <translation>Archivos Matlab (*.m *.m.matlab)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="700"/> + <source>Matlab Files (*.m)</source> + <translation>Archivos Matlab (*.m)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="703"/> + <source>Octave Files (*.m.octave)</source> + <translation>Archivos Octave (*.m.octave)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="490"/> + <source>Octave Files (*.m *.m.octave)</source> + <translation>Archivos Octave (*.m *.m.octave)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="133"/> <source>QSS</source> <translation>QSS</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="157"/> + <location filename="../QScintilla/Lexers/__init__.py" line="153"/> <source>Gettext</source> <translation>Gettext</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="695"/> + <location filename="../QScintilla/Lexers/__init__.py" line="709"/> <source>Gettext Files (*.po)</source> <translation>Archivos Gettext (*.po)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="162"/> + <location filename="../QScintilla/Lexers/__init__.py" line="158"/> <source>CoffeeScript</source> <translation>CoffeeScript</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="702"/> + <location filename="../QScintilla/Lexers/__init__.py" line="716"/> <source>CoffeeScript Files (*.coffee)</source> <translation>Archivos CoffeeScript (*.coffee)</translation> </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="163"/> + <source>JSON</source> + <translation>JSON</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="723"/> + <source>JSON Files (*.json)</source> + <translation>Archivos JSON (*.json)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="166"/> + <source>Markdown</source> + <translation>Markdown</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="728"/> + <source>Markdown Files (*.md)</source> + <translation>Archivos Markdown (*.md)</translation> + </message> </context> <context> <name>LfConvertDataDialog</name> @@ -35114,6 +35306,19 @@ </message> </context> <context> + <name>MarkdownProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/MarkdownProvider.py" line="383"/> + <source>Create List</source> + <translation>Crear Lista</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/MarkdownProvider.py" line="383"/> + <source>Enter desired number of list elements:</source> + <translation>Introducir número de elementos deseados en la lista:</translation> + </message> +</context> +<context> <name>MasterPasswordEntryDialog</name> <message> <location filename="../Preferences/ConfigurationPages/MasterPasswordEntryDialog.ui" line="14"/> @@ -35189,12 +35394,12 @@ <context> <name>McCabeChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="423"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="426"/> <source>'{0}' is too complex ({1})</source> <translation>'{0}' es demasiado complejo ({1})</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="425"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="428"/> <source>{0}: {1}</source> <translation>{0}: {1}</translation> </message> @@ -35222,126 +35427,111 @@ <translation>Introducir el número de mensajes de registro a ser mostrados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="155"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="161"/> <source>No. of commit messages to remember:</source> <translation>Número de mensajes de commit a recordar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="168"/> <source>Enter the number of commit messages to remember</source> <translation>Introduzca el número de mensajes de commit a recordar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="216"/> - <source>Incoming / Outgoing</source> - <translation>Entrante/ Saliente</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="222"/> - <source>Select to show the incoming and outgoing log in a log browser dialog</source> - <translation>Seleccionar para mostrar los registros entrantes y salientes en un diálogo de navegación de registros</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="225"/> - <source>Use Log Browser for incoming / outgoing log</source> - <translation>Utilizar el Navegador de Registros para mensajes de registro entrantes / salientes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="235"/> - <source>Pull</source> - <translation>Hacer Pull</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="242"/> <source>Select to update the working directory to new tip</source> <translation>Seleccionar para actualizar el directorio de trabajo a la nueva tip</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="236"/> + <source>Pull</source> + <translation>Hacer Pull</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="245"/> <source>Update after pulling</source> <translation>Hacer update despues de hacer pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="334"/> <source>Edit the Mercurial configuration file</source> <translation>Editar el archivo de configuración de mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="337"/> <source>Edit configuration file</source> <translation>Editar archivo de configuración</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="311"/> <source>Cleanup</source> <translation>Limpiar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="317"/> <source>Pattern:</source> <translation>Patrón:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="324"/> <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> <translation>Intruducir el patrón de nombres de archivo a utilizar para la limpieza (entradas separadas por un caracter de espacio)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="252"/> <source>Select to prefer unbundle over pull</source> <translation>Seleccionar para preferir unbundle en lugar de pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="255"/> <source><b>Prefer Unbundle</b> <p>If this option is selected, it will be checked, if a Mercurial changegroups file from a previous "Show Incoming" request exists. In this case it will be applied and deleted. Otherwise a pull request will be sent.</p></source> <translation><b>Preferir Unbundle</b> <p>Si se selecciona esta opción, se comprobará si existe un archivo de changegroups de Mercurial de alguna solicitud "Show Incoming" anterior. De ser así, éste será aplicado y borrado. En cualquier otro caso, se enviará una solicitud de pull.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="259"/> <source>Prefer Unbundle</source> <translation>Preferir Unbundle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="292"/> <source>Revert</source> <translation>Revertir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="298"/> <source>Select to create a backup file (.orig) before reverting changes</source> <translation>Seleccionar para crear un archivo de backup (.orig) antes de revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="301"/> <source>Create Backup Files</source> <translation>Crear Archivos de Backup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="269"/> <source>Merge</source> <translation>Hacer merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="275"/> <source>Select to enforce usage of the Mercural internal merge tool</source> <translation>Seleccionar para forzar el uso de la herramienta interna de Mercurial de merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="278"/> <source><b>Internal Merge Tool</b> <p>Select to enforce usage of the Mercural internal merge tool,which leaves conflict markers in the file in case of conflicting changes.</p></source> <translation><b>Herramienta Interna Merge</b> <p>Seleccionar para forzar el uso de la herramienta interna de Mercurial de merge. Ésta deja los marcadores de conflicto en el archivo en caso de cambios conflictivos.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="282"/> <source>Use internal merge with conflict markers</source> <translation>Utilizar merge interno con marcadores de conflicto</translation> </message> @@ -35376,15 +35566,25 @@ <translation>Tener en cuenta changesets ocultos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="197"/> <source>No. of commit authors to remember:</source> <translation>Núm. de autores de commit a recordar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="204"/> <source>Enter the number of commit authors to remember</source> <translation>Introducir el número de autores de commits a recordar</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="132"/> + <source>No. of message characters shown in list:</source> + <translation>Núm. de caracteres del mensaje mostrados en la lista:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="139"/> + <source>Enter the number of characters of the commit message to be shown in the list</source> + <translation>Introducir el número de caracteres del mensaje de commit a mostrar en la lista</translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -35507,92 +35707,92 @@ <translation>Botones Estándar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="40"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="219"/> <source>Apply</source> <translation>Aplicar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="39"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="226"/> <source>Abort</source> <translation>Abortar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="41"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="233"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="45"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="240"/> <source>Ignore</source> <translation>Ignorar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="54"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="247"/> <source>Save all</source> <translation>Guardar todo</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="53"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="254"/> <source>Save</source> <translation>Guardar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="43"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="261"/> <source>Discard</source> <translation>Descartar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="56"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="268"/> <source>Yes to all</source> <translation>Si a todo</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="49"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="275"/> <source>Open</source> <translation>Abrir</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="50"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="282"/> <source>Reset</source> <translation>Reiniciar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="48"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="289"/> <source>Ok</source> <translation>Ok</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="46"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="296"/> <source>No</source> <translation>No</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="44"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="303"/> <source>Help</source> <translation>Ayuda</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="47"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="310"/> <source>No to all</source> <translation>No a todo</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="52"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="317"/> <source>Retry</source> <translation>Reintentar</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="51"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="324"/> <source>Restore defaults</source> <translation>Restaurar valores por defecto</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="55"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="331"/> <source>Yes</source> <translation>Si</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="42"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="338"/> <source>Close</source> <translation>Cerrar</translation> </message> @@ -36343,107 +36543,107 @@ <context> <name>MiscellaneousChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="429"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="432"/> <source>coding magic comment not found</source> <translation>comentario mágico de codificación no encontrado</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="432"/> - <source>unknown encoding ({0}) found in coding magic comment</source> - <translation>codificación desconocida ({0}) encontrada en comentario mágico de codificación</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="435"/> - <source>copyright notice not present</source> - <translation>nota de copyright no presente</translation> + <source>unknown encoding ({0}) found in coding magic comment</source> + <translation>codificación desconocida ({0}) encontrada en comentario mágico de codificación</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="438"/> - <source>copyright notice contains invalid author</source> - <translation>la nota de copyright contiene un autor no válido</translation> + <source>copyright notice not present</source> + <translation>nota de copyright no presente</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="441"/> - <source>blind except: statement</source> - <translation>sentencia except: ciega</translation> + <source>copyright notice contains invalid author</source> + <translation>la nota de copyright contiene un autor no válido</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="444"/> - <source>found {0} formatter</source> - <translation>encontrado formateador {0}</translation> + <source>blind except: statement</source> + <translation>sentencia except: ciega</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="447"/> - <source>format string does contain unindexed parameters</source> - <translation>cadena de formato que contiene parámetros sin indexar</translation> + <source>found {0} formatter</source> + <translation>encontrado formateador {0}</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="450"/> - <source>docstring does contain unindexed parameters</source> - <translation>docstring cque contiene parámetros sin indexar</translation> + <source>format string does contain unindexed parameters</source> + <translation>cadena de formato que contiene parámetros sin indexar</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="453"/> - <source>other string does contain unindexed parameters</source> - <translation>otra cadena contiene parámetros sin indexar</translation> + <source>docstring does contain unindexed parameters</source> + <translation>docstring cque contiene parámetros sin indexar</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="456"/> - <source>format call uses too large index ({0})</source> - <translation>llamada de formato usa un índice demasiado largo ({0})</translation> + <source>other string does contain unindexed parameters</source> + <translation>otra cadena contiene parámetros sin indexar</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="459"/> - <source>format call uses missing keyword ({0})</source> - <translation>llamada de formato usa una palabra clave desaparecida ({0})</translation> + <source>format call uses too large index ({0})</source> + <translation>llamada de formato usa un índice demasiado largo ({0})</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="462"/> - <source>format call uses keyword arguments but no named entries</source> - <translation>llamada de formato usa argumentos de palabra clave pero sin entradas con nombre</translation> + <source>format call uses missing keyword ({0})</source> + <translation>llamada de formato usa una palabra clave desaparecida ({0})</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="465"/> - <source>format call uses variable arguments but no numbered entries</source> - <translation>llamada de formato usa argumentos de variable pero sin entradas numeradas</translation> + <source>format call uses keyword arguments but no named entries</source> + <translation>llamada de formato usa argumentos de palabra clave pero sin entradas con nombre</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="468"/> - <source>format call uses implicit and explicit indexes together</source> - <translation>llamada de formato usa juntos índices implícitos y explícitos</translation> + <source>format call uses variable arguments but no numbered entries</source> + <translation>llamada de formato usa argumentos de variable pero sin entradas numeradas</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="471"/> - <source>format call provides unused index ({0})</source> - <translation>llamada de formato proporciona índice que no se usa ({0})</translation> + <source>format call uses implicit and explicit indexes together</source> + <translation>llamada de formato usa juntos índices implícitos y explícitos</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="474"/> - <source>format call provides unused keyword ({0})</source> - <translation>llamada de formato proporciona palabra clave que no se usa ({0})</translation> + <source>format call provides unused index ({0})</source> + <translation>llamada de formato proporciona índice que no se usa ({0})</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="477"/> - <source>expected these __future__ imports: {0}; but only got: {1}</source> - <translation>se esperaban estos __future__ imports: {0} pero solamente hay: {1}</translation> + <source>format call provides unused keyword ({0})</source> + <translation>llamada de formato proporciona palabra clave que no se usa ({0})</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="480"/> - <source>expected these __future__ imports: {0}; but got none</source> - <translation>se esperaban estos __future__ imports: {0}; but no hay ninguno</translation> + <source>expected these __future__ imports: {0}; but only got: {1}</source> + <translation>se esperaban estos __future__ imports: {0} pero solamente hay: {1}</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="483"/> - <source>print statement found</source> - <translation>encontrada sentencia print</translation> + <source>expected these __future__ imports: {0}; but got none</source> + <translation>se esperaban estos __future__ imports: {0}; but no hay ninguno</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="486"/> - <source>one element tuple found</source> - <translation>tupla de un elemento encontrada</translation> + <source>print statement found</source> + <translation>encontrada sentencia print</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="489"/> + <source>one element tuple found</source> + <translation>tupla de un elemento encontrada</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="492"/> <source>{0}: {1}</source> <translation>{0}: {1}</translation> </message> @@ -36836,72 +37036,72 @@ <context> <name>NamingStyleChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="378"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> <source>class names should use CapWords convention</source> <translation>nombres de clase deben usar la convención de CapWords</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> - <source>function name should be lowercase</source> - <translation>nombres de función deben ser en minúsculas</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="384"/> - <source>argument name should be lowercase</source> - <translation>nombre de argumento debe ser en minúsculas</translation> + <source>function name should be lowercase</source> + <translation>nombres de función deben ser en minúsculas</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="387"/> - <source>first argument of a class method should be named 'cls'</source> - <translation>primer argumento de método de clase debe ser nombrado 'cls'</translation> + <source>argument name should be lowercase</source> + <translation>nombre de argumento debe ser en minúsculas</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="390"/> - <source>first argument of a method should be named 'self'</source> - <translation>prmier argumento de un método debe ser nombrado 'self'</translation> + <source>first argument of a class method should be named 'cls'</source> + <translation>primer argumento de método de clase debe ser nombrado 'cls'</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="393"/> + <source>first argument of a method should be named 'self'</source> + <translation>prmier argumento de un método debe ser nombrado 'self'</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="396"/> <source>first argument of a static method should not be named 'self' or 'cls</source> <translation>primer argumento de método estático no debe ser llamado 'self' o 'cls'</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="397"/> - <source>module names should be lowercase</source> - <translation>nombres de módulo deben ser en minúsculas</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="400"/> - <source>package names should be lowercase</source> - <translation>nombres de package deben ser en minúsculas</translation> + <source>module names should be lowercase</source> + <translation>nombres de módulo deben ser en minúsculas</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="403"/> - <source>constant imported as non constant</source> - <translation>constante importada como no constante</translation> + <source>package names should be lowercase</source> + <translation>nombres de package deben ser en minúsculas</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="406"/> - <source>lowercase imported as non lowercase</source> - <translation>minúscula importada como no minúscula</translation> + <source>constant imported as non constant</source> + <translation>constante importada como no constante</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="409"/> - <source>camelcase imported as lowercase</source> - <translation>camelcase importado como minúsculas</translation> + <source>lowercase imported as non lowercase</source> + <translation>minúscula importada como no minúscula</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="412"/> - <source>camelcase imported as constant</source> - <translation>camelcase importado como constante</translation> + <source>camelcase imported as lowercase</source> + <translation>camelcase importado como minúsculas</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="415"/> - <source>variable in function should be lowercase</source> - <translation>variable en función debe ser en minúsculas</translation> + <source>camelcase imported as constant</source> + <translation>camelcase importado como constante</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="418"/> + <source>variable in function should be lowercase</source> + <translation>variable en función debe ser en minúsculas</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="421"/> <source>names 'l', 'O' and 'I' should be avoided</source> <translation>nombres 'l', 'O' y 'I' deben ser evitados</translation> </message> @@ -37332,7 +37532,7 @@ <context> <name>NoCacheHostsDialog</name> <message> - <location filename="../Helpviewer/Network/NoCacheHostsDialog.py" line="52"/> + <location filename="../Helpviewer/Network/NoCacheHostsDialog.ui" line="14"/> <source>Not Cached Hosts</source> <translation>Hosts no en Caché</translation> </message> @@ -37440,7 +37640,7 @@ <translation>Pulsar para seleccionar la posición visualmente, soltar para asignar</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NotificationsPage.py" line="81"/> + <location filename="../Preferences/ConfigurationPages/NotificationsPage.ui" line="146"/> <source>Visual Selection</source> <translation>Selección Visual</translation> </message> @@ -38113,7 +38313,7 @@ <context> <name>PasswordsDialog</name> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="91"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.ui" line="14"/> <source>Saved Passwords</source> <translation>Contraseñas Almacenadas</translation> </message> @@ -39280,27 +39480,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1525"/> + <location filename="../Preferences/__init__.py" line="1530"/> <source>Export Preferences</source> <translation>Exportar Preferencias</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1553"/> + <location filename="../Preferences/__init__.py" line="1558"/> <source>Import Preferences</source> <translation>Importar Preferencias</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1553"/> + <location filename="../Preferences/__init__.py" line="1558"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1655"/> + <location filename="../Preferences/__init__.py" line="1660"/> <source>Select Python{0} Interpreter</source> <translation>Seleccionar intérprete de Python{0}</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1655"/> + <location filename="../Preferences/__init__.py" line="1660"/> <source>Select the Python{0} interpreter to be used:</source> <translation>Seleccionar el intérprete de Python{0} a utilizar:</translation> </message> @@ -39326,12 +39526,7 @@ <translation><p>No hay vista previa disponible para este tipo de archivo.</p></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="597"/> - <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> - <translation><p>La previsualización de Markdown requiere el package <b>python-markdown</b>.<br/>Instalar con el gestor de paquetes o ver <a href="http://pythonhosted.org/Markdown/install.html">las instrucciones de instalación.</a></p></translation> - </message> - <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="572"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="565"/> <source><p>ReStructuredText preview requires the <b>python-docutils</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pypi.python.org/pypi/docutils">this page.</a></p></source> <translation><p>La previsualización de ReStructuredText requiere el package <b>python-docutils</b> .<br/>Installar con el gestor de paquetes, 'pip install docutils' o ver <a href="http://pypi.python.org/pypi/docutils">esta página .</a></p></translation> </message> @@ -39340,6 +39535,11 @@ <source><p>ReStructuredText preview requires the <b>sphinx</b> package.<br/>Install it with your package manager,'pip install Sphinx' or see <a href="http://pypi.python.org/pypi/Sphinx">this page.</a></p><p>Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.</p></source> <translation><p>La previsualización de ReStructuredText requiere el package <b>sphinx</b> .<br/>Installar con el gestor de paquetes, 'pip install sphinx' o ver <a href="http://pypi.python.org/pypi/Sphinx">esta página .</a></p><p>Como alternativa, se puede deshabilitar el uso de Sphinx en el Editor, página de configuración de Gestión de Archivos.</p></translation> </message> + <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="590"/> + <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> + <translation><p>La previsualización de Markdown requiere el package <b>python-markdown</b>.<br/>Instalar con el gestor de paquetes o ver en <a href="http://pythonhosted.org/Markdown/install.html">las instrucciones de instalación.</a></p></translation> + </message> </context> <context> <name>PreviewerHTML</name> @@ -39364,17 +39564,17 @@ <translation>Habilitar Includes del Lado del Servidor</translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="177"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="179"/> <source><p>No preview available for this type of file.</p></source> <translation><p>No hay vista previa disponible para este tipo de archivo.</p></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="225"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="230"/> <source>Preview - {0}</source> <translation>Vista Previa - {0}</translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="227"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="232"/> <source>Preview</source> <translation>Vista Previa</translation> </message> @@ -39733,207 +39933,207 @@ <translation>Otro</translation> </message> <message> - <location filename="../Project/Project.py" line="715"/> + <location filename="../Project/Project.py" line="735"/> <source>Read project file</source> <translation>Leer archivo de proyecto</translation> </message> <message> - <location filename="../Project/Project.py" line="815"/> + <location filename="../Project/Project.py" line="835"/> <source>Save project file</source> <translation>Guardar proyecto</translation> </message> <message> - <location filename="../Project/Project.py" line="851"/> + <location filename="../Project/Project.py" line="871"/> <source>Read user project properties</source> <translation>Leer las propiedades de proyecto del usuario</translation> </message> <message> - <location filename="../Project/Project.py" line="875"/> + <location filename="../Project/Project.py" line="895"/> <source>Save user project properties</source> <translation>Guardar propiedades de proyecto del usuario</translation> </message> <message> - <location filename="../Project/Project.py" line="933"/> + <location filename="../Project/Project.py" line="953"/> <source>Read project session</source> <translation>Leer sesion de proyecto</translation> </message> <message> - <location filename="../Project/Project.py" line="1155"/> + <location filename="../Project/Project.py" line="1175"/> <source>Please save the project first.</source> <translation>Por favor guarde primero el proyecto.</translation> </message> <message> - <location filename="../Project/Project.py" line="969"/> + <location filename="../Project/Project.py" line="989"/> <source>Save project session</source> <translation>Guardar sesion de proyecto</translation> </message> <message> - <location filename="../Project/Project.py" line="998"/> + <location filename="../Project/Project.py" line="1018"/> <source>Delete project session</source> <translation>Borrar sesion de proyecto</translation> </message> <message> - <location filename="../Project/Project.py" line="1032"/> - <source>Read tasks</source> - <translation>Leer tareas</translation> - </message> - <message> <location filename="../Project/Project.py" line="1052"/> + <source>Read tasks</source> + <translation>Leer tareas</translation> + </message> + <message> + <location filename="../Project/Project.py" line="1072"/> <source>Save tasks</source> <translation>Guardar Tareas</translation> </message> <message> - <location filename="../Project/Project.py" line="1109"/> + <location filename="../Project/Project.py" line="1129"/> <source>Read debugger properties</source> <translation>Leer propiedades del depurador</translation> </message> <message> - <location filename="../Project/Project.py" line="1143"/> + <location filename="../Project/Project.py" line="1163"/> <source>Save debugger properties</source> <translation>Guardar propiedades del depurador</translation> </message> <message> - <location filename="../Project/Project.py" line="1169"/> + <location filename="../Project/Project.py" line="1189"/> <source>Delete debugger properties</source> <translation>Borrar propiedades del depurador</translation> </message> <message> - <location filename="../Project/Project.py" line="1277"/> + <location filename="../Project/Project.py" line="1297"/> <source>Add Language</source> <translation>Añadir lenguaje</translation> </message> <message> - <location filename="../Project/Project.py" line="1399"/> + <location filename="../Project/Project.py" line="1419"/> <source>Delete translation</source> <translation>Borrar traducción</translation> </message> <message> - <location filename="../Project/Project.py" line="1550"/> + <location filename="../Project/Project.py" line="1570"/> <source>Add file</source> <translation>Agregar archivo</translation> </message> <message> - <location filename="../Project/Project.py" line="1667"/> + <location filename="../Project/Project.py" line="1687"/> <source>The target directory must not be empty.</source> <translation>El directorio de destino no puede estar vacío.</translation> </message> <message> - <location filename="../Project/Project.py" line="1678"/> + <location filename="../Project/Project.py" line="1698"/> <source>Add directory</source> <translation>Añadir directorio</translation> </message> <message> - <location filename="../Project/Project.py" line="1581"/> + <location filename="../Project/Project.py" line="1601"/> <source><p>The source directory doesn't contain any files belonging to the selected category.</p></source> <translation><p>El directorio de origen no contiene archivos que pertenezcan a la categoría seleccionada.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1678"/> + <location filename="../Project/Project.py" line="1698"/> <source>The source directory must not be empty.</source> <translation>El directorio de origen no puede estar vacío.</translation> </message> <message> - <location filename="../Project/Project.py" line="1802"/> + <location filename="../Project/Project.py" line="1822"/> <source>Rename file</source> <translation>Renombrar archivo</translation> </message> <message> - <location filename="../Project/Project.py" line="1826"/> + <location filename="../Project/Project.py" line="1846"/> <source>Rename File</source> <translation>Renombrar Archivo</translation> </message> <message> - <location filename="../Project/Project.py" line="2062"/> + <location filename="../Project/Project.py" line="2082"/> <source>Delete file</source> <translation>Borrar archivo</translation> </message> <message> - <location filename="../Project/Project.py" line="2091"/> + <location filename="../Project/Project.py" line="2111"/> <source>Delete directory</source> <translation>Borrar directorio</translation> </message> <message> - <location filename="../Project/Project.py" line="2173"/> + <location filename="../Project/Project.py" line="2193"/> <source>Create project directory</source> <translation>Crear directorio de proyecto</translation> </message> <message> - <location filename="../Project/Project.py" line="2703"/> + <location filename="../Project/Project.py" line="2723"/> <source>New Project</source> <translation>Proyecto nuevo</translation> </message> <message> - <location filename="../Project/Project.py" line="2253"/> + <location filename="../Project/Project.py" line="2273"/> <source>Add existing files to the project?</source> <translation>¿Agregar archivos existentes al proyecto?</translation> </message> <message> - <location filename="../Project/Project.py" line="2703"/> + <location filename="../Project/Project.py" line="2723"/> <source>Select Version Control System</source> <translation>Seleccion el Sistema de control de versiones (VCS)</translation> </message> <message> - <location filename="../Project/Project.py" line="2372"/> + <location filename="../Project/Project.py" line="2392"/> <source>Would you like to edit the VCS command options?</source> <translation>¿Le gustaría editar las opciones de comando para VCS?</translation> </message> <message> - <location filename="../Project/Project.py" line="3521"/> + <location filename="../Project/Project.py" line="3541"/> <source>New project</source> <translation>Proyecto nuevo</translation> </message> <message> - <location filename="../Project/Project.py" line="2320"/> + <location filename="../Project/Project.py" line="2340"/> <source>Shall the project file be added to the repository?</source> <translation>¿Debe añadirse el archivo de proyecto al repositorio?</translation> </message> <message> - <location filename="../Project/Project.py" line="2351"/> + <location filename="../Project/Project.py" line="2371"/> <source>None</source> <translation>Ninguno</translation> </message> <message> - <location filename="../Project/Project.py" line="2344"/> + <location filename="../Project/Project.py" line="2364"/> <source>Select version control system for the project</source> <translation>Seleccione el sistema de control de versiones para el proyecto</translation> </message> <message> - <location filename="../Project/Project.py" line="3535"/> + <location filename="../Project/Project.py" line="3555"/> <source>Open project</source> <translation>Abrir proyecto</translation> </message> <message> - <location filename="../Project/Project.py" line="2842"/> + <location filename="../Project/Project.py" line="2862"/> <source>Project Files (*.e4p)</source> <translation>Archivos de proyecto (*.e4p)</translation> </message> <message> - <location filename="../Project/Project.py" line="3572"/> + <location filename="../Project/Project.py" line="3592"/> <source>Save project as</source> <translation>Guardar proyecto como</translation> </message> <message> - <location filename="../Project/Project.py" line="2857"/> + <location filename="../Project/Project.py" line="2877"/> <source>Save File</source> <translation>Guardar archivo</translation> </message> <message> - <location filename="../Project/Project.py" line="2893"/> + <location filename="../Project/Project.py" line="2913"/> <source>Close Project</source> <translation>Cerrar Proyecto</translation> </message> <message> - <location filename="../Project/Project.py" line="2893"/> + <location filename="../Project/Project.py" line="2913"/> <source>The current project has unsaved changes.</source> <translation>El proyecto actual tiene cambios sin guardar.</translation> </message> <message> - <location filename="../Project/Project.py" line="3058"/> + <location filename="../Project/Project.py" line="3078"/> <source>Syntax errors detected</source> <translation>Se detectaron errores de sintaxis</translation> </message> <message numerus="yes"> - <location filename="../Project/Project.py" line="3058"/> + <location filename="../Project/Project.py" line="3078"/> <source>The project contains %n file(s) with syntax errors.</source> <translation> <numerusform>El archivo contiene %n archivo(s) con errores de sintaxis.</numerusform> @@ -39941,577 +40141,577 @@ </translation> </message> <message> - <location filename="../Project/Project.py" line="3521"/> + <location filename="../Project/Project.py" line="3541"/> <source>&New...</source> <translation>&Nuevo...</translation> </message> <message> - <location filename="../Project/Project.py" line="3526"/> + <location filename="../Project/Project.py" line="3546"/> <source>Generate a new project</source> <translation>Generar un nuevo proyecto</translation> </message> <message> - <location filename="../Project/Project.py" line="3527"/> + <location filename="../Project/Project.py" line="3547"/> <source><b>New...</b><p>This opens a dialog for entering the info for a new project.</p></source> <translation><b>Nuevo...</b><p>Abre un diálogo para introducir la información para un nuevo proyecto.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3535"/> + <location filename="../Project/Project.py" line="3555"/> <source>&Open...</source> <translation>&Abrir...</translation> </message> <message> - <location filename="../Project/Project.py" line="3540"/> - <source>Open an existing project</source> - <translation>Abrir un proyecto existente</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3541"/> - <source><b>Open...</b><p>This opens an existing project.</p></source> - <translation><b>Abrir...</b><p>Abre un proyecto existente..</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3548"/> - <source>Close project</source> - <translation>Cerrar proyecto</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3548"/> - <source>&Close</source> - <translation>&Cerrar</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3552"/> - <source>Close the current project</source> - <translation>Cierra el proyecto actual</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3553"/> - <source><b>Close</b><p>This closes the current project.</p></source> - <translation><b>Cerrar</b><p>Cierra el proyecto actualt.</p></translation> - </message> - <message> <location filename="../Project/Project.py" line="3560"/> - <source>Save project</source> - <translation>Guardar proyecto</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3751"/> - <source>&Save</source> - <translation>&Guardar</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3564"/> - <source>Save the current project</source> - <translation>Guarda el proyecto actual</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3565"/> - <source><b>Save</b><p>This saves the current project.</p></source> - <translation><b>Guardar</b><p>Guarda el proyecto actual.</p></translation> + <source>Open an existing project</source> + <translation>Abrir un proyecto existente</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3561"/> + <source><b>Open...</b><p>This opens an existing project.</p></source> + <translation><b>Abrir...</b><p>Abre un proyecto existente..</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3568"/> + <source>Close project</source> + <translation>Cerrar proyecto</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3568"/> + <source>&Close</source> + <translation>&Cerrar</translation> </message> <message> <location filename="../Project/Project.py" line="3572"/> - <source>Save &as...</source> - <translation>Guardar co&mo...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3576"/> - <source>Save the current project to a new file</source> - <translation>Guardar el proyecto actual en un nuevo archivo</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3578"/> - <source><b>Save as</b><p>This saves the current project to a new file.</p></source> - <translation><b>Guardar como</b><p>Guarda el proyecto en otro archivo.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3587"/> - <source>Add files to project</source> - <translation>Agregar archivos al proyecto</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3587"/> - <source>Add &files...</source> - <translation>&Agregar archivos...</translation> + <source>Close the current project</source> + <translation>Cierra el proyecto actual</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3573"/> + <source><b>Close</b><p>This closes the current project.</p></source> + <translation><b>Cerrar</b><p>Cierra el proyecto actualt.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3580"/> + <source>Save project</source> + <translation>Guardar proyecto</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3771"/> + <source>&Save</source> + <translation>&Guardar</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3584"/> + <source>Save the current project</source> + <translation>Guarda el proyecto actual</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3585"/> + <source><b>Save</b><p>This saves the current project.</p></source> + <translation><b>Guardar</b><p>Guarda el proyecto actual.</p></translation> </message> <message> <location filename="../Project/Project.py" line="3592"/> + <source>Save &as...</source> + <translation>Guardar co&mo...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3596"/> + <source>Save the current project to a new file</source> + <translation>Guardar el proyecto actual en un nuevo archivo</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3598"/> + <source><b>Save as</b><p>This saves the current project to a new file.</p></source> + <translation><b>Guardar como</b><p>Guarda el proyecto en otro archivo.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3607"/> + <source>Add files to project</source> + <translation>Agregar archivos al proyecto</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3607"/> + <source>Add &files...</source> + <translation>&Agregar archivos...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3612"/> <source>Add files to the current project</source> <translation>Añadir archivos al proyecto actual</translation> </message> <message> - <location filename="../Project/Project.py" line="3594"/> + <location filename="../Project/Project.py" line="3614"/> <source><b>Add files...</b><p>This opens a dialog for adding files to the current project. The place to add is determined by the file extension.</p></source> <translation><b>Añadir archivos...</b><p>Abre un diálogo para añadir archivos al proyecto actual. El lugar donde se van a añadir es determinado por la extensión del nombre de archivo.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3603"/> + <location filename="../Project/Project.py" line="3623"/> <source>Add directory to project</source> <translation>Agregar directorio al proyecto</translation> </message> <message> - <location filename="../Project/Project.py" line="3603"/> - <source>Add directory...</source> - <translation>Agregar directorio...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3608"/> - <source>Add a directory to the current project</source> - <translation>Agregar directorio al proyecto actual</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3610"/> - <source><b>Add directory...</b><p>This opens a dialog for adding a directory to the current project.</p></source> - <translation><b>Añadir directorio...</b><p>Abre un diálogo para añadir un directorio al proyecto actual.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3618"/> - <source>Add translation to project</source> - <translation>Añadir traducción al proyecto</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3618"/> - <source>Add &translation...</source> - <translation>Añadir &Traducción...</translation> - </message> - <message> <location filename="../Project/Project.py" line="3623"/> + <source>Add directory...</source> + <translation>Agregar directorio...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3628"/> + <source>Add a directory to the current project</source> + <translation>Agregar directorio al proyecto actual</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3630"/> + <source><b>Add directory...</b><p>This opens a dialog for adding a directory to the current project.</p></source> + <translation><b>Añadir directorio...</b><p>Abre un diálogo para añadir un directorio al proyecto actual.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3638"/> + <source>Add translation to project</source> + <translation>Añadir traducción al proyecto</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3638"/> + <source>Add &translation...</source> + <translation>Añadir &Traducción...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3643"/> <source>Add a translation to the current project</source> <translation>Añadir una traducción al proyecto actual</translation> </message> <message> - <location filename="../Project/Project.py" line="3625"/> + <location filename="../Project/Project.py" line="3645"/> <source><b>Add translation...</b><p>This opens a dialog for add a translation to the current project.</p></source> <translation><b>Añadir traducción...</b><p>Abre un diálogo para añadir una traducción al proyecto actual.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3633"/> + <location filename="../Project/Project.py" line="3653"/> <source>Search new files</source> <translation>Buscar archivos nuevos</translation> </message> <message> - <location filename="../Project/Project.py" line="3633"/> + <location filename="../Project/Project.py" line="3653"/> <source>Searc&h new files...</source> <translation>Bus&car archivos nuevos...</translation> </message> <message> - <location filename="../Project/Project.py" line="3637"/> + <location filename="../Project/Project.py" line="3657"/> <source>Search new files in the project directory.</source> <translation>Bucar nuevos archivos en el directorio de proyecto.</translation> </message> <message> - <location filename="../Project/Project.py" line="3639"/> + <location filename="../Project/Project.py" line="3659"/> <source><b>Search new files...</b><p>This searches for new files (sources, *.ui, *.idl) in the project directory and registered subdirectories.</p></source> <translation><b>Buscar nuevos archivos...</b><p>Busca nuevos archivos (fuentes, *.ui, *.idl) en el directorio del proyecto y en los subdirectorios registrados.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3662"/> + <location filename="../Project/Project.py" line="3682"/> <source>Project properties</source> <translation>Propiedades del proyecto</translation> </message> <message> - <location filename="../Project/Project.py" line="3662"/> - <source>&Properties...</source> - <translation>&Propiedades...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3667"/> - <source>Show the project properties</source> - <translation>Ver las propiedades del proyecto</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3668"/> - <source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source> - <translation><b>Propiedades...</b><p>Muestra un diálogo para editar las propiedades del proyecto.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3675"/> - <source>User project properties</source> - <translation>Propiedades del usuario del proyecto</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3675"/> - <source>&User Properties...</source> - <translation>Propiedades del &Usuario...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3680"/> - <source>Show the user specific project properties</source> - <translation>Muestra propiedades del proyecto específicas del usuario</translation> - </message> - <message> <location filename="../Project/Project.py" line="3682"/> + <source>&Properties...</source> + <translation>&Propiedades...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3687"/> + <source>Show the project properties</source> + <translation>Ver las propiedades del proyecto</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3688"/> + <source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source> + <translation><b>Propiedades...</b><p>Muestra un diálogo para editar las propiedades del proyecto.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3695"/> + <source>User project properties</source> + <translation>Propiedades del usuario del proyecto</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3695"/> + <source>&User Properties...</source> + <translation>Propiedades del &Usuario...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3700"/> + <source>Show the user specific project properties</source> + <translation>Muestra propiedades del proyecto específicas del usuario</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3702"/> <source><b>User Properties...</b><p>This shows a dialog to edit the user specific project properties.</p></source> <translation><b>Propiedades del Usuario...</b><p>Abre un diálogo par editar las propiedades del proyecto específicas del usuario.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3690"/> + <location filename="../Project/Project.py" line="3710"/> <source>Filetype Associations</source> <translation>Asociación de tipos de archivo</translation> </message> <message> - <location filename="../Project/Project.py" line="3690"/> + <location filename="../Project/Project.py" line="3710"/> <source>Filetype Associations...</source> <translation>Asociación de tipos de archivo...</translation> </message> <message> - <location filename="../Project/Project.py" line="3694"/> + <location filename="../Project/Project.py" line="3714"/> <source>Show the project filetype associations</source> <translation>Ver las asociaciones del proyecto</translation> </message> <message> - <location filename="../Project/Project.py" line="3696"/> + <location filename="../Project/Project.py" line="3716"/> <source><b>Filetype Associations...</b><p>This shows a dialog to edit the filetype associations of the project. These associations determine the type (source, form, interface or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.</p></source> <translation><b>Asociaciones de Tipo de Archivo...</b><p>Muestra un diálogo para editar las asociaciones de los tipos de archivos del proyecto. Estas asociaciones determinan el tipo (fuente, formulario, interfaz u otras) con un patrón de nombres de archivo. Se usan cuando se añade un archivo al proyecto y cuando se realiza una búsqueda de nuevos archivos.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3726"/> + <location filename="../Project/Project.py" line="3746"/> <source>Debugger Properties</source> <translation>Propiedades del depurador</translation> </message> <message> - <location filename="../Project/Project.py" line="3726"/> + <location filename="../Project/Project.py" line="3746"/> <source>Debugger &Properties...</source> <translation>&Propiedades del depurador...</translation> </message> <message> - <location filename="../Project/Project.py" line="3730"/> + <location filename="../Project/Project.py" line="3750"/> <source>Show the debugger properties</source> <translation>Muestra las propiedades del depurador</translation> </message> <message> - <location filename="../Project/Project.py" line="3731"/> - <source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source> - <translation><b>Propiedades del Depurador...</b><p>Abre un diálogo par editar las propiedades del depurador específicas del proyecto.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3739"/> - <source>Load</source> - <translation>Cargar</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3739"/> - <source>&Load</source> - <translation>&Cargar</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3743"/> - <source>Load the debugger properties</source> - <translation>Cargar las propiedades del depurador</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3744"/> - <source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source> - <translation><b>Cargar Propiedades del Depurador</b><p>Carga las opciones de configuración del depurador específicas del proyecto.</p></translation> - </message> - <message> <location filename="../Project/Project.py" line="3751"/> - <source>Save</source> - <translation>Guardar</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3755"/> - <source>Save the debugger properties</source> - <translation>Guardar propiedades del depurador</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3756"/> - <source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source> - <translation><b>Guardar Propiedades del Depurador</b><p>Guarda las opciones de configuración del depurador específicas del proyecto.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3763"/> - <source>Delete</source> - <translation>Borrar</translation> + <source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source> + <translation><b>Propiedades del Depurador...</b><p>Abre un diálogo par editar las propiedades del depurador específicas del proyecto.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3759"/> + <source>Load</source> + <translation>Cargar</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3759"/> + <source>&Load</source> + <translation>&Cargar</translation> </message> <message> <location filename="../Project/Project.py" line="3763"/> - <source>&Delete</source> - <translation>&Borrar</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3767"/> - <source>Delete the debugger properties</source> - <translation>Borrar las propiedades del depurador</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3768"/> - <source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source> - <translation><b>Borrar Propiedades del Depurador</b><p>Borra el archivo que contiene las opciones de configuración del depurador específicas del proyecto.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3776"/> - <source>Reset</source> - <translation>Reiniciar</translation> + <source>Load the debugger properties</source> + <translation>Cargar las propiedades del depurador</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3764"/> + <source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source> + <translation><b>Cargar Propiedades del Depurador</b><p>Carga las opciones de configuración del depurador específicas del proyecto.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3771"/> + <source>Save</source> + <translation>Guardar</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3775"/> + <source>Save the debugger properties</source> + <translation>Guardar propiedades del depurador</translation> </message> <message> <location filename="../Project/Project.py" line="3776"/> + <source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source> + <translation><b>Guardar Propiedades del Depurador</b><p>Guarda las opciones de configuración del depurador específicas del proyecto.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3783"/> + <source>Delete</source> + <translation>Borrar</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3783"/> + <source>&Delete</source> + <translation>&Borrar</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3787"/> + <source>Delete the debugger properties</source> + <translation>Borrar las propiedades del depurador</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3788"/> + <source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source> + <translation><b>Borrar Propiedades del Depurador</b><p>Borra el archivo que contiene las opciones de configuración del depurador específicas del proyecto.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3796"/> + <source>Reset</source> + <translation>Reiniciar</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3796"/> <source>&Reset</source> <translation>&Reiniciar</translation> </message> <message> - <location filename="../Project/Project.py" line="3780"/> + <location filename="../Project/Project.py" line="3800"/> <source>Reset the debugger properties</source> <translation>Restablecer las propiedades del depurador</translation> </message> <message> - <location filename="../Project/Project.py" line="3781"/> + <location filename="../Project/Project.py" line="3801"/> <source><b>Reset Debugger Properties</b><p>This resets the project specific debugger settings.</p></source> <translation><b>Restablecer Propiedades del Depurador</b><p>Restablece las opciones de configuración del depurador específicas del proyecto.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3790"/> + <location filename="../Project/Project.py" line="3810"/> <source>Load session</source> <translation>Cargar sesión</translation> </message> <message> - <location filename="../Project/Project.py" line="3794"/> + <location filename="../Project/Project.py" line="3814"/> <source>Load the projects session file.</source> <translation>Cargar archivo de sesión de proyectos.</translation> </message> <message> - <location filename="../Project/Project.py" line="3795"/> + <location filename="../Project/Project.py" line="3815"/> <source><b>Load session</b><p>This loads the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Cargar sesión</b><p>Carga el archivo de sesión de proyecto. La sesión consiste en los datos siguientes.<br>- todos los archivos de fuentes abiertos<br>- todos los puntos de interrupción<br>- todos los argumentos de línea de comandos<br>- el directorio de trabajo<br>- el flag de reporte de excepciones</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3808"/> + <location filename="../Project/Project.py" line="3828"/> <source>Save session</source> <translation>Guardar sesión</translation> </message> <message> - <location filename="../Project/Project.py" line="3812"/> + <location filename="../Project/Project.py" line="3832"/> <source>Save the projects session file.</source> <translation>Guardar archivos de sessión de proyecto.</translation> </message> <message> - <location filename="../Project/Project.py" line="3813"/> + <location filename="../Project/Project.py" line="3833"/> <source><b>Save session</b><p>This saves the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Guardar sesión</b><p>Guarda el archivo de sesión de proyecto. La sesión consiste en los datos siguientes.<br>- todos los archivos de fuentes abiertos<br>- todos los puntos de interrupción<br>- todos los argumentos de línea de comandos<br>- el directorio de trabajo<br>- el flag de reporte de excepciones</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3826"/> - <source>Delete session</source> - <translation>Borrar sesión</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3830"/> - <source>Delete the projects session file.</source> - <translation>Borrar el archivo de sesión de proyecto.</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3831"/> - <source><b>Delete session</b><p>This deletes the projects session file</p></source> - <translation><b>Borrar sesión</b><p>Borra el archivo de sesión del proyecto</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3840"/> - <source>Code Metrics</source> - <translation>Métricas de código</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3840"/> - <source>&Code Metrics...</source> - <translation>Métricas de &código...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3844"/> - <source>Show some code metrics for the project.</source> - <translation>Muestra algunas métricas del código para este proyecto.</translation> - </message> - <message> <location filename="../Project/Project.py" line="3846"/> - <source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source> - <translation><b>Métricas de Código...</b><p>Muestra algunas métricas de código para todos los archivos Python en el proyecto.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3854"/> - <source>Python Code Coverage</source> - <translation>Cobertura de Código Python</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3854"/> - <source>Code Co&verage...</source> - <translation>Co&bertura de código...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3858"/> - <source>Show code coverage information for the project.</source> - <translation>Muestra información de cobertura de código para el proyecto.</translation> + <source>Delete session</source> + <translation>Borrar sesión</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3850"/> + <source>Delete the projects session file.</source> + <translation>Borrar el archivo de sesión de proyecto.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3851"/> + <source><b>Delete session</b><p>This deletes the projects session file</p></source> + <translation><b>Borrar sesión</b><p>Borra el archivo de sesión del proyecto</p></translation> </message> <message> <location filename="../Project/Project.py" line="3860"/> - <source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source> - <translation><b>Cobertura de Código...</b><p>Muestra la información de cobertura de código para todos los archivos Python en el proyecto.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="4646"/> - <source>Profile Data</source> - <translation>Datos de perfil</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3868"/> - <source>&Profile Data...</source> - <translation>Datos de &pefil...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3872"/> - <source>Show profiling data for the project.</source> - <translation>Mostrar datos de profiling para el proyecto.</translation> + <source>Code Metrics</source> + <translation>Métricas de código</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3860"/> + <source>&Code Metrics...</source> + <translation>Métricas de &código...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3864"/> + <source>Show some code metrics for the project.</source> + <translation>Muestra algunas métricas del código para este proyecto.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3866"/> + <source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source> + <translation><b>Métricas de Código...</b><p>Muestra algunas métricas de código para todos los archivos Python en el proyecto.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3874"/> + <source>Python Code Coverage</source> + <translation>Cobertura de Código Python</translation> </message> <message> <location filename="../Project/Project.py" line="3874"/> + <source>Code Co&verage...</source> + <translation>Co&bertura de código...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3878"/> + <source>Show code coverage information for the project.</source> + <translation>Muestra información de cobertura de código para el proyecto.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3880"/> + <source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source> + <translation><b>Cobertura de Código...</b><p>Muestra la información de cobertura de código para todos los archivos Python en el proyecto.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4666"/> + <source>Profile Data</source> + <translation>Datos de perfil</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3888"/> + <source>&Profile Data...</source> + <translation>Datos de &pefil...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3892"/> + <source>Show profiling data for the project.</source> + <translation>Mostrar datos de profiling para el proyecto.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3894"/> <source><b>Profile Data...</b><p>This shows the profiling data for the project.</p></source> <translation><b>Datos de Profiling...</b><p>Muestra datos de profiling para el proyecto.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4700"/> + <location filename="../Project/Project.py" line="4720"/> <source>Application Diagram</source> <translation>Diagrama de Aplicación</translation> </message> <message> - <location filename="../Project/Project.py" line="3883"/> + <location filename="../Project/Project.py" line="3903"/> <source>&Application Diagram...</source> <translation>Diagrama de &Aplicación...</translation> </message> <message> - <location filename="../Project/Project.py" line="3887"/> + <location filename="../Project/Project.py" line="3907"/> <source>Show a diagram of the project.</source> <translation>Mostrar diagrama del proyecto.</translation> </message> <message> - <location filename="../Project/Project.py" line="3889"/> + <location filename="../Project/Project.py" line="3909"/> <source><b>Application Diagram...</b><p>This shows a diagram of the project.</p></source> <translation><b>Diagrama de Aplicación...</b><p>Muestra un diagrama del proyecto.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4885"/> + <location filename="../Project/Project.py" line="4905"/> <source>Create Package List</source> <translation>Crear Lista del Paquete</translation> </message> <message> - <location filename="../Project/Project.py" line="3912"/> + <location filename="../Project/Project.py" line="3932"/> <source>Create &Package List</source> <translation>Crear &Package List</translation> </message> <message> - <location filename="../Project/Project.py" line="5143"/> + <location filename="../Project/Project.py" line="5163"/> <source>Create Plugin Archive</source> <translation>Crear Archivo de Plugin</translation> </message> <message> - <location filename="../Project/Project.py" line="3982"/> + <location filename="../Project/Project.py" line="4002"/> <source>&Project</source> <translation>&Proyecto</translation> </message> <message> - <location filename="../Project/Project.py" line="3983"/> + <location filename="../Project/Project.py" line="4003"/> <source>Open &Recent Projects</source> <translation>Abrir Proyectos &Recientes</translation> </message> <message> - <location filename="../Project/Project.py" line="3984"/> + <location filename="../Project/Project.py" line="4004"/> <source>&Version Control</source> <translation>Control de &Versiones</translation> </message> <message> - <location filename="../Project/Project.py" line="3988"/> + <location filename="../Project/Project.py" line="4008"/> <source>Chec&k</source> <translation>Veri&ficar</translation> </message> <message> - <location filename="../Project/Project.py" line="3990"/> + <location filename="../Project/Project.py" line="4010"/> <source>Sho&w</source> <translation>V&er</translation> </message> <message> - <location filename="../Project/Project.py" line="3991"/> + <location filename="../Project/Project.py" line="4011"/> <source>&Diagrams</source> <translation>&Diagramas</translation> </message> <message> - <location filename="../Project/Project.py" line="3992"/> + <location filename="../Project/Project.py" line="4012"/> <source>Session</source> <translation>Sesión</translation> </message> <message> - <location filename="../Project/Project.py" line="3993"/> + <location filename="../Project/Project.py" line="4013"/> <source>Source &Documentation</source> <translation>Origen de &Documentación </translation> </message> <message> - <location filename="../Project/Project.py" line="3995"/> + <location filename="../Project/Project.py" line="4015"/> <source>Debugger</source> <translation>Depurador</translation> </message> <message> - <location filename="../Project/Project.py" line="3996"/> + <location filename="../Project/Project.py" line="4016"/> <source>Pac&kagers</source> <translation>Empa&quetadores</translation> </message> <message> - <location filename="../Project/Project.py" line="4104"/> + <location filename="../Project/Project.py" line="4124"/> <source>Project</source> <translation>Proyecto</translation> </message> <message> - <location filename="../Project/Project.py" line="4170"/> + <location filename="../Project/Project.py" line="4190"/> <source>&Clear</source> <translation>&Borrar</translation> </message> <message> - <location filename="../Project/Project.py" line="4309"/> + <location filename="../Project/Project.py" line="4329"/> <source>Search New Files</source> <translation>Buscar nuevos archivos</translation> </message> <message> - <location filename="../Project/Project.py" line="4309"/> + <location filename="../Project/Project.py" line="4329"/> <source>There were no new files found to be added.</source> <translation>No se han encontrado nuevos archivos para ser añadidos.</translation> </message> <message> - <location filename="../Project/Project.py" line="4455"/> + <location filename="../Project/Project.py" line="4475"/> <source>Version Control System</source> <translation>Sistema de control de versiones</translation> </message> <message> - <location filename="../Project/Project.py" line="4573"/> + <location filename="../Project/Project.py" line="4593"/> <source>Coverage Data</source> <translation>Datos de Cobertura</translation> </message> <message> - <location filename="../Project/Project.py" line="4623"/> + <location filename="../Project/Project.py" line="4643"/> <source>There is no main script defined for the current project. Aborting</source> <translation>No hay script principal definido para el proyecto actual. Abortando</translation> </message> <message> - <location filename="../Project/Project.py" line="4596"/> + <location filename="../Project/Project.py" line="4616"/> <source>Code Coverage</source> <translation>Cobertura de codigo</translation> </message> <message> - <location filename="../Project/Project.py" line="4596"/> + <location filename="../Project/Project.py" line="4616"/> <source>Please select a coverage file</source> <translation>Por favor seleccione un archivo de cobertura</translation> </message> <message> - <location filename="../Project/Project.py" line="4646"/> + <location filename="../Project/Project.py" line="4666"/> <source>Please select a profile file</source> <translation>Por favor seleccione un archivo de profiling</translation> </message> <message> - <location filename="../Project/Project.py" line="4700"/> + <location filename="../Project/Project.py" line="4720"/> <source>Include module names?</source> <translation>¿Incluir nombres de módulos?</translation> </message> <message> - <location filename="../Project/Project.py" line="4845"/> + <location filename="../Project/Project.py" line="4865"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>El archivo <b>PKGLIST</b> ya existe.</p><p>¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4904"/> + <location filename="../Project/Project.py" line="4924"/> <source>The project does not have a main script defined. Aborting...</source> <translation>No hay script principal definido para el proyecto actual. Abortando...</translation> </message> @@ -40521,42 +40721,42 @@ <translation>Registrando Tipo de Proyecto</translation> </message> <message> - <location filename="../Project/Project.py" line="3928"/> + <location filename="../Project/Project.py" line="3948"/> <source>Create Plugin &Archives</source> <translation>Crear &Archivos de Plugin</translation> </message> <message> - <location filename="../Project/Project.py" line="1277"/> + <location filename="../Project/Project.py" line="1297"/> <source>You have to specify a translation pattern first.</source> <translation>Debe especificar primero un patrón de traducción.</translation> </message> <message> - <location filename="../Project/Project.py" line="2450"/> + <location filename="../Project/Project.py" line="2470"/> <source>Translation Pattern</source> <translation>Patrón de Traducción</translation> </message> <message> - <location filename="../Project/Project.py" line="2450"/> + <location filename="../Project/Project.py" line="2470"/> <source>Enter the path pattern for translation files (use '%language%' in place of the language code):</source> <translation>Introduzca el patrón de ruta para los archivos de traducción (use '%language%' in lugar del código de idioma):</translation> </message> <message> - <location filename="../Project/Project.py" line="3708"/> + <location filename="../Project/Project.py" line="3728"/> <source>Lexer Associations</source> <translation>Asociaciones de Analizador Léxico</translation> </message> <message> - <location filename="../Project/Project.py" line="3708"/> + <location filename="../Project/Project.py" line="3728"/> <source>Lexer Associations...</source> <translation>Asociaciones de Analizador Léxico...</translation> </message> <message> - <location filename="../Project/Project.py" line="3712"/> + <location filename="../Project/Project.py" line="3732"/> <source>Show the project lexer associations (overriding defaults)</source> <translation>Ver las asociaciones de analizador léxico del proyecto (sobreescribiendo valores por defecto)</translation> </message> <message> - <location filename="../Project/Project.py" line="3714"/> + <location filename="../Project/Project.py" line="3734"/> <source><b>Lexer Associations...</b><p>This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.</p></source> <translation><b>Asociaciones de Analizador Léxico ...</b><p>Muestra un diálogo para editar las asociaciones de analizador léxico del proyecto. Estas asociaciones sobreescriben las asociaciones de analizador léxico globales. Los analizadores léxicos se utilizan para resaltar el texto en el editor.</p></translation> </message> @@ -40576,127 +40776,127 @@ <translation>Archivos Python3 (*.py *.py3);;Archivos de GUI Python3 (*.pyw *.pyw3);;</translation> </message> <message> - <location filename="../Project/Project.py" line="715"/> + <location filename="../Project/Project.py" line="735"/> <source><p>The project file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo de proyecto <b>{0}</b> no ha podido ser leído.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="815"/> + <location filename="../Project/Project.py" line="835"/> <source><p>The project file <b>{0}</b> could not be written.</p></source> <translation><p>El archivo de proyecto <b>{0}</b> no ha podido ser guardado.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="851"/> + <location filename="../Project/Project.py" line="871"/> <source><p>The user specific project properties file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo de propiedades de proyecto específicas del usuario <b>{0}</b> no ha podido ser leído.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="875"/> + <location filename="../Project/Project.py" line="895"/> <source><p>The user specific project properties file <b>{0}</b> could not be written.</p></source> <translation><p>El archivo de propiedades de proyecto específicas del usuario <b>{0}</b> no ha podido ser guardado.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="933"/> + <location filename="../Project/Project.py" line="953"/> <source><p>The project session file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo de sesión de proyecto <b>{0}</b> no ha podido leerse.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="969"/> + <location filename="../Project/Project.py" line="989"/> <source><p>The project session file <b>{0}</b> could not be written.</p></source> <translation><p>El archivo de sesión de proyecto <b>{0}</b> no ha podido guardarse.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="998"/> + <location filename="../Project/Project.py" line="1018"/> <source><p>The project session file <b>{0}</b> could not be deleted.</p></source> <translation><p>El archivo de sesión de proyecto <b>{0}</b> no ha podido borrarse.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1032"/> - <source><p>The tasks file <b>{0}</b> could not be read.</p></source> - <translation><p>El archivo de tareas <b>{0}</b> no puede leerse.</p></translation> - </message> - <message> <location filename="../Project/Project.py" line="1052"/> + <source><p>The tasks file <b>{0}</b> could not be read.</p></source> + <translation><p>El archivo de tareas <b>{0}</b> no puede leerse.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="1072"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation><p>El archivo de tareas <b>{0}</b> no pudo ser guardado.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1109"/> + <location filename="../Project/Project.py" line="1129"/> <source><p>The project debugger properties file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo de propiedades del depurador del proyecto <b>{0}</b> no ha podido leerse.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1143"/> + <location filename="../Project/Project.py" line="1163"/> <source><p>The project debugger properties file <b>{0}</b> could not be written.</p></source> <translation><p>El archivo de propiedades del depurador del proyecto <b>{0}</b> no pudo ser guardado.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1169"/> + <location filename="../Project/Project.py" line="1189"/> <source><p>The project debugger properties file <b>{0}</b> could not be deleted.</p></source> <translation><p>El archivo de propiedades del depurador del proyecto <b>{0}</b> no pudo ser borrado.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1399"/> + <location filename="../Project/Project.py" line="1419"/> <source><p>The selected translation file <b>{0}</b> could not be deleted.</p></source> <translation><p>El archivo de traducción seleccionado <b>{0}</b> no ha podido ser borrado.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1612"/> + <location filename="../Project/Project.py" line="1632"/> <source><p>The file <b>{0}</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>El archivo <b>{0}</b> ya existe.</p><p>¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Project/Project.py" line="2857"/> + <location filename="../Project/Project.py" line="2877"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo <b>{0}</b> ya existe.</p><p>¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1826"/> + <location filename="../Project/Project.py" line="1846"/> <source><p>The file <b>{0}</b> could not be renamed.<br />Reason: {1}</p></source> <translation><p>El archivo <b>{0}</b> no puede ser renombrado.<br />Causa: {1}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="2062"/> + <location filename="../Project/Project.py" line="2082"/> <source><p>The selected file <b>{0}</b> could not be deleted.</p></source> <translation><p>El archivo seleccionado <b>{0}</b> no ha podido borrarse.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="2091"/> + <location filename="../Project/Project.py" line="2111"/> <source><p>The selected directory <b>{0}</b> could not be deleted.</p></source> <translation><p>El directorio seleccionado <b>{0}</b> no ha podido borrarse.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="2173"/> + <location filename="../Project/Project.py" line="2193"/> <source><p>The project directory <b>{0}</b> could not be created.</p></source> <translation><p>El directorio de proyecto <b>{0}</b> no pudo ser creado.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4455"/> + <location filename="../Project/Project.py" line="4475"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Disabling version control.</p><p>{1}</p></source> <translation><p>El VCS seleccionado <b>{0}</b> no ha sido encontrado.<br>Deshabilitando control de versiones.</p><p>{1}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4885"/> + <location filename="../Project/Project.py" line="4905"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation><p>El archivo <b>PKGLIST</b> no puede ser creado.</p><p>Causa: {0}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="5027"/> + <location filename="../Project/Project.py" line="5047"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation><p>El fichero<b>{0}</b> no ha podido ser almacenado en el archivo. Va a ser ignorado.</p><p>Causa: {1}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="5101"/> + <location filename="../Project/Project.py" line="5121"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>El archivo de plugin<b>{0}</b> no puede ser leido.</p><p>Causa: {1}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1538"/> + <location filename="../Project/Project.py" line="1558"/> <source><p>The selected file <b>{0}</b> could not be added to <b>{1}</b>.</p><p>Reason: {2}</p></source> <translation><p>El archivo seleccionado <b>{0}</b> no ha podido se añadido a <b>{1}</b>.</p><p>Razón: {2}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1594"/> + <location filename="../Project/Project.py" line="1614"/> <source><p>The target directory <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation><p>El directorio de destino <b>{0}</b> no ha podido ser creado.</p><p>Razón: {1}</p></translation> </message> @@ -40706,32 +40906,32 @@ <translation>Archivos Python2(*.py2);;Archivos de GUI Python2 (*.pyw2);;</translation> </message> <message> - <location filename="../Project/Project.py" line="2240"/> + <location filename="../Project/Project.py" line="2260"/> <source>Create main script</source> <translation>Crear script principal</translation> </message> <message> - <location filename="../Project/Project.py" line="2240"/> + <location filename="../Project/Project.py" line="2260"/> <source><p>The mainscript <b>{0}</b> could not be created.<br/>Reason: {1}</p></source> <translation><p>El script principal <b>{0}</b> no se ha podido crear.<br/>Razón: {1}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3897"/> + <location filename="../Project/Project.py" line="3917"/> <source>Load Diagram</source> <translation>Cargar Diagrama</translation> </message> <message> - <location filename="../Project/Project.py" line="3897"/> + <location filename="../Project/Project.py" line="3917"/> <source>&Load Diagram...</source> <translation>&Cargar Diagrama...</translation> </message> <message> - <location filename="../Project/Project.py" line="3901"/> + <location filename="../Project/Project.py" line="3921"/> <source>Load a diagram from file.</source> <translation>CArgar diagrama desde archivo.</translation> </message> <message> - <location filename="../Project/Project.py" line="3903"/> + <location filename="../Project/Project.py" line="3923"/> <source><b>Load Diagram...</b><p>This loads a diagram from file.</p></source> <translation><b>Cargar Diagrama...</b><p>Carga un diagrama desde un archivo.</p></translation> </message> @@ -40761,37 +40961,37 @@ <translation>Consola PyQt5</translation> </message> <message> - <location filename="../Project/Project.py" line="4443"/> + <location filename="../Project/Project.py" line="4463"/> <source><p>The selected VCS <b>{0}</b> could not be found. <br/>Reverting override.</p><p>{1}</p></source> <translation><p>El VCS seleccionado <b>{0}</b> no ha sido encontrado.<br>Revirtiendo sobreescritura.</p><p>{1}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="5143"/> + <location filename="../Project/Project.py" line="5163"/> <source><p>The plugin file <b>{0}</b> could not be read.</p> <p>Reason: {1}</p></source> <translation><p>El archivo de plugin<b>{0}</b> no puede ser leido.</p><p>Causa: {1}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3917"/> + <location filename="../Project/Project.py" line="3937"/> <source>Create an initial PKGLIST file for an eric6 plugin.</source> <translation>Crear un archivo inicial PKGLIST para un plugin para eric6.</translation> </message> <message> - <location filename="../Project/Project.py" line="3919"/> + <location filename="../Project/Project.py" line="3939"/> <source><b>Create Package List</b><p>This creates an initial list of files to include in an eric6 plugin archive. The list is created from the project file.</p></source> <translation><b>Crear Package List</b><p>Crea una lista inicial de archivos para incluir en un archivo de plugin para eric6. Esta lista se crea a partir del archivo de proyecto.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3933"/> + <location filename="../Project/Project.py" line="3953"/> <source>Create eric6 plugin archive files.</source> <translation>Crear ficheros para archivo de plugin de eric6.</translation> </message> <message> - <location filename="../Project/Project.py" line="3935"/> + <location filename="../Project/Project.py" line="3955"/> <source><b>Create Plugin Archives</b><p>This creates eric6 plugin archive files using the list of files given in a PKGLIST* file. The archive name is built from the main script name if not designated in the package list file.</p></source> <translation><b>Crear Archivo de Plugin</b><p>Crea ficheros para archivo de plugin de eric6 utilizando el listado de ficheros proporcionados en un archivo PKGLIST*. El nombre de archivo se crea a partir del nombre del script principal si no se desinga uno en el archivo de lista de package.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4992"/> + <location filename="../Project/Project.py" line="5012"/> <source><p>The eric6 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation><p>El archivo de plugin de eric6 <b>{0}</b> no ha podido ser creado. Abortando...</p><p>Razón: {1}</p></translation> </message> @@ -40811,103 +41011,103 @@ <translation>Eric6 Plugin</translation> </message> <message> - <location filename="../Project/Project.py" line="2673"/> + <location filename="../Project/Project.py" line="2693"/> <source>Create project management directory</source> <translation>Crear directorio de gestión del proyecto</translation> </message> <message> - <location filename="../Project/Project.py" line="2673"/> + <location filename="../Project/Project.py" line="2693"/> <source><p>The project directory <b>{0}</b> is not writable.</p></source> <translation><p>El directorio del proyecto <b>{0}</b> no se puede escribir.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3647"/> + <location filename="../Project/Project.py" line="3667"/> <source>Alt+Ctrl+P</source> <comment>Project|Search Project File</comment> <translation>Alt+Ctrl+P</translation> </message> <message> - <location filename="../Project/Project.py" line="3653"/> + <location filename="../Project/Project.py" line="3673"/> <source>Search for a file in the project list of files.</source> <translation>Bucar un archivo en el listado de archivos del proyecto.</translation> </message> <message> - <location filename="../Project/Project.py" line="3655"/> + <location filename="../Project/Project.py" line="3675"/> <source><b>Search Project File</b><p>This searches for a file in the project list of files.</p></source> <translation><b>Buscar Archivo en el Proyecto</b><p>Busca un archivo en el listado de archivos del proyecto.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3647"/> + <location filename="../Project/Project.py" line="3667"/> <source>Search Project File</source> <translation>Buscar Archivo en Proyecto</translation> </message> <message> - <location filename="../Project/Project.py" line="3647"/> + <location filename="../Project/Project.py" line="3667"/> <source>Search Project File...</source> <translation>Buscar Archivo en Proyecto...</translation> </message> <message> - <location filename="../Project/Project.py" line="4939"/> + <location filename="../Project/Project.py" line="4959"/> <source>Create Plugin Archives</source> <translation>Crear Archivos de Plugin</translation> </message> <message> - <location filename="../Project/Project.py" line="3945"/> + <location filename="../Project/Project.py" line="3965"/> <source>Create Plugin Archives (Snapshot)</source> <translation>Crear Archivos de Plugin (Snapshot)</translation> </message> <message> - <location filename="../Project/Project.py" line="3945"/> + <location filename="../Project/Project.py" line="3965"/> <source>Create Plugin Archives (&Snapshot)</source> <translation>Crear Archivos de Plugin (&Snapshot)</translation> </message> <message> - <location filename="../Project/Project.py" line="3950"/> + <location filename="../Project/Project.py" line="3970"/> <source>Create eric6 plugin archive files (snapshot releases).</source> <translation>Crear ficheros para archivo de plugin de eric6 (snapshot releases).</translation> </message> <message> - <location filename="../Project/Project.py" line="3952"/> + <location filename="../Project/Project.py" line="3972"/> <source><b>Create Plugin Archives (Snapshot)</b><p>This creates eric6 plugin archive files using the list of files given in the PKGLIST* file. The archive name is built from the main script name if not designated in the package list file. The version entry of the main script is modified to reflect a snapshot release.</p></source> <translation><b>Crear Archivos de Plugin (Snapshot)</b><p>Crea ficheros para archivo de plugin de eric6 usando el listado de ficheros dado en un archivo PKGLIST*. El nombre del archivo se construye a partir del nombre del script principal si no se designa uno en el archivo de package list. La entrada de versión del script principal se modifica para reflejar una snapshot release.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4918"/> + <location filename="../Project/Project.py" line="4938"/> <source>Select package lists:</source> <translation>Seleccionar package lists:</translation> </message> <message> - <location filename="../Project/Project.py" line="4935"/> + <location filename="../Project/Project.py" line="4955"/> <source>Creating plugin archives...</source> <translation>Creando archivos de plugin...</translation> </message> <message> - <location filename="../Project/Project.py" line="4935"/> + <location filename="../Project/Project.py" line="4955"/> <source>Abort</source> <translation>Abortar</translation> </message> <message> - <location filename="../Project/Project.py" line="4935"/> + <location filename="../Project/Project.py" line="4955"/> <source>%v/%m Archives</source> <translation>%v/%m Archivos</translation> </message> <message> - <location filename="../Project/Project.py" line="4952"/> + <location filename="../Project/Project.py" line="4972"/> <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>El archivo<b>{0}</b> no puede ser leído.</p><p>Causa: {1}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="5046"/> + <location filename="../Project/Project.py" line="5066"/> <source><p>The eric6 plugin archive files were created with some errors.</p></source> <translation><p>Los ficheros para archivo de plugin de eric6 se han creado con errores.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="5049"/> + <location filename="../Project/Project.py" line="5069"/> <source><p>The eric6 plugin archive files were created successfully.</p></source> <translation><p>Los ficheros para archivo de plugin de eric6 se han creado correctamente.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4928"/> + <location filename="../Project/Project.py" line="4948"/> <source><p>No package list files (PKGLIST*) available or selected. Aborting...</p></source> <translation><p>No hay archivo de package list (PKGLIST*) disponible o seleccionado. Abortando...</p></translation> </message> @@ -42877,7 +43077,7 @@ <translation>Ejecutadas</translation> </message> <message> - <location filename="../DataViews/PyCoverageDialog.py" line="349"/> + <location filename="../DataViews/PyCoverageDialog.ui" line="172"/> <source>Coverage</source> <translation>Cobertura</translation> </message> @@ -42957,7 +43157,7 @@ </translation> </message> <message> - <location filename="../DataViews/PyCoverageDialog.py" line="345"/> + <location filename="../DataViews/PyCoverageDialog.ui" line="192"/> <source>%v/%m Files</source> <translation>%v/%m Archivos</translation> </message> @@ -42965,7 +43165,7 @@ <context> <name>PyProfileDialog</name> <message> - <location filename="../DataViews/PyProfileDialog.py" line="233"/> + <location filename="../DataViews/PyProfileDialog.ui" line="20"/> <source>Profile Results</source> <translation>Resultados de Profiling</translation> </message> @@ -43920,521 +44120,501 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/> - <source>Show log</source> - <translation>Mostrar log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/> - <source>Show &log</source> - <translation>Mostrar &log</translation> + <source>Show log browser</source> + <translation>Mostrar navegador de log</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> - <source>Show the log of the local project</source> - <translation>Mostrar el log del proyecto local</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation>Mostrar un diálogo para navegar el log del proyecto local</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="107"/> - <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation><b>Mostrar log</b><p>Muestra el log del proyecto local.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="114"/> - <source>Show log browser</source> - <translation>Mostrar navegador de log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="119"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>Mostrar un diálogo para navegar el log del proyecto local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Mostrar navegador de log</b><p>Muestra un diálogo para navegar el log del proyecto local. Al principio se muestra un número limitado de entradas. Se pueden recuperar más entradas despues.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/> <source>Show differences</source> <translation>Mostrar diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/> <source>Show &difference</source> <translation>Mostrar &diferencia</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/> <source>Show the difference of the local project to the repository</source> <translation>Mostrar las diferencias entre el proyecto local y el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation><b>Mostrar diferencias</b><p>Muestra diferencias entre el proyecto local y el repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="132"/> <source>Show differences (extended)</source> <translation>Mostrar diferencias (extendido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="137"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Muestra la diferencia de revisiones entre el proyecto y el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="140"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation><b>Mostrar diferencias (extendido)</b><p>Muestra diferencias entre revisiones seleccionables del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/> <source>Show differences (URLs)</source> <translation>Mostrar diferencias (URLs)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="153"/> <source>Show the difference of the project between two repository URLs</source> <translation>Muestra la diferencia en el proyecto entre dos URLs de repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="156"/> <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> <translation><b>Mostrar diferencias (URLs)</b><p>Muestra diferencias para el proyecto entre dos URLs de repositorios.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/> + <source>Show status</source> + <translation>Mostrar estado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/> + <source>Show &status</source> + <translation>Mostrar e&stado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> + <source>Show the status of the local project</source> + <translation>Mostrar el estado del proyecto local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="172"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation><b>Mostrar estado</b><p>Muestra el estado del proyecto local.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> - <source>Show status</source> - <translation>Mostrar estado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> - <source>Show &status</source> - <translation>Mostrar e&stado</translation> + <source>Show change lists</source> + <translation>Mostrar listas de cambios</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/> - <source>Show the status of the local project</source> - <translation>Mostrar el estado del proyecto local</translation> + <source>Show the change lists and associated files of the local project</source> + <translation>Mostrar las listas de cambios y los archivos asociados del proyecto local</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="187"/> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation><b>Mostrar estado</b><p>Muestra el estado del proyecto local.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> - <source>Show change lists</source> - <translation>Mostrar listas de cambios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="199"/> - <source>Show the change lists and associated files of the local project</source> - <translation>Mostrar las listas de cambios y los archivos asociados del proyecto local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="202"/> <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> <translation><b>Mostrar listas de cambios</b><p>Muestra las listas de cambios y los archivos asociados del proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> <source>Show repository info</source> <translation>Mostrar informacion del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="215"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="200"/> <source>Show some repository related information for the local project</source> <translation>Mostrar información relacionada con el repositorio para el proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="203"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation><b>Mostrar información del repositorio</b><p>Muestra información relacionada con el repositorio para el proyecto local.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source>Tag in repository</source> + <translation>Crear un Tag en el repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source>&Tag in repository...</source> + <translation>Crear un &Tag en el repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="216"/> + <source>Tag the local project in the repository</source> + <translation>Crear un tag del proyecto local en el repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> - <source>Tag in repository</source> - <translation>Crear un Tag en el repositorio</translation> + <source>Export from repository</source> + <translation>Exportar desde repositorio</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> - <source>&Tag in repository...</source> - <translation>Crear un &Tag en el repositorio...</translation> + <source>&Export from repository...</source> + <translation>&Exportar desde repositorio...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="231"/> - <source>Tag the local project in the repository</source> - <translation>Crear un tag del proyecto local en el repositorio</translation> + <source>Export a project from the repository</source> + <translation>Exportar un proyecto desde el repositorio</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>Exportar desde repositorio</b><p>Exporta un proyecto desde el repositorio.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> - <source>Export from repository</source> - <translation>Exportar desde repositorio</translation> + <source>Command options</source> + <translation>Opciones de comando</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> - <source>&Export from repository...</source> - <translation>&Exportar desde repositorio...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="246"/> - <source>Export a project from the repository</source> - <translation>Exportar un proyecto desde el repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation><b>Exportar desde repositorio</b><p>Exporta un proyecto desde el repositorio.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/> - <source>Command options</source> - <translation>Opciones de comando</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/> <source>Command &options...</source> <translation>&Opciones de comando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Show the VCS command options</source> <translation>Mostrar opciones de comando VCS</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation><b>Opciones de comando...</b><p>Muestra un diálogo para editar las opciones de comando VCS.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/> + <source>Revert changes</source> + <translation>Revertir cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/> + <source>Re&vert changes</source> + <translation>Re&vertir cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <source>Revert all changes made to the local project</source> + <translation>Revertir todos los cambios hechos al proyecto local</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation><b>Opciones de comando...</b><p>Muestra un diálogo para editar las opciones de comando VCS.</p></translation> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation><b>Revertir cambios</b><p>Revierte todos los cambios hechos al proyecto local.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/> - <source>Revert changes</source> - <translation>Revertir cambios</translation> + <source>Merge</source> + <translation>Hacer merge</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/> - <source>Re&vert changes</source> - <translation>Re&vertir cambios</translation> + <source>Mer&ge changes...</source> + <translation>Hacer mer&ge de los cambios...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> - <source>Revert all changes made to the local project</source> - <translation>Revertir todos los cambios hechos al proyecto local</translation> + <source>Merge changes of a tag/revision into the local project</source> + <translation>Hacer merge de los cambios de una tag/revision al proyecto local</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation><b>Revertir cambios</b><p>Revierte todos los cambios hechos al proyecto local.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/> - <source>Merge</source> - <translation>Hacer merge</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/> - <source>Mer&ge changes...</source> - <translation>Hacer mer&ge de los cambios...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="289"/> - <source>Merge changes of a tag/revision into the local project</source> - <translation>Hacer merge de los cambios de una tag/revision al proyecto local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Merge</b><p>Hace un merge de los cambios de una tag/revision al proyecto local.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/> + <source>Switch</source> + <translation>Hacer switch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/> + <source>S&witch...</source> + <translation>Hacer s&witch...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <source>Switch the local copy to another tag/branch</source> + <translation>Hace un switch de la copia local a otra tag/branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> + <translation><b>Hacer switch</b><p>Hace un switch de la copia local a otra tag/branch.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>Switch</source> - <translation>Hacer switch</translation> + <source>Conflicts resolved</source> + <translation>Conflictos resueltos</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>S&witch...</source> - <translation>Hacer s&witch...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> - <source>Switch the local copy to another tag/branch</source> - <translation>Hace un switch de la copia local a otra tag/branch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> - <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> - <translation><b>Hacer switch</b><p>Hace un switch de la copia local a otra tag/branch.</p></translation> + <source>Con&flicts resolved</source> + <translation>Con&flictos resueltos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="304"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation>Marcar todos los conflictos del proyecto local como resueltos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="307"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation><b>Conflictos resueltos</b><p>Marca todos los conflictos del proyecto local como resueltos.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> - <source>Conflicts resolved</source> - <translation>Conflictos resueltos</translation> + <source>Cleanup</source> + <translation>Limpiar (cleanup)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> - <source>Con&flicts resolved</source> - <translation>Con&flictos resueltos</translation> + <source>Cleanu&p</source> + <translation>Lim&piar (cleanup)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation>Marcar todos los conflictos del proyecto local como resueltos</translation> + <source>Cleanup the local project</source> + <translation>Limpiar (cleanup) el proyecto local</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="322"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation><b>Conflictos resueltos</b><p>Marca todos los conflictos del proyecto local como resueltos.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/> - <source>Cleanup</source> - <translation>Limpiar (cleanup)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/> - <source>Cleanu&p</source> - <translation>Lim&piar (cleanup)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> - <source>Cleanup the local project</source> - <translation>Limpiar (cleanup) el proyecto local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="337"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Limpieza (cleanup)</b><p>Lleva a cabo un cleanup del proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>Execute command</source> <translation>Ejecutar comando</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>E&xecute command...</source> <translation>E&jecutar comando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="333"/> <source>Execute an arbitrary VCS command</source> <translation>Ejecuta un comando VCS arbitrario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="336"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando VCS arbitrario.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/> <source>List tags</source> <translation>Listar tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/> <source>List tags...</source> <translation>Listar tags...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> <source>List tags of the project</source> <translation>Lista los tags del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="350"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Listar tags</b><p>Lista los tags del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches</source> <translation>Listar branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches...</source> <translation>Listar branches...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="361"/> <source>List branches of the project</source> <translation>Lista las branches del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="364"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source>List repository contents</source> <translation>Listar contenido del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source>List repository contents...</source> <translation>Listar contenido del repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="375"/> <source>Lists the contents of the repository</source> <translation>Lista el contenido del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation><b>Listar contenido del repositorio</b><p>Lista el contenido del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/> <source>Set Property</source> <translation>Establecer propiedad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/> <source>Set Property...</source> <translation>Establecer propiedad...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="389"/> <source>Set a property for the project files</source> <translation>Establece una propiedad para los archivos del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="392"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation><b>Establecer Propiedad</b><p>Establece una propiedad para los archivos del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source>List Properties</source> <translation>Listar propiedades</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source>List Properties...</source> <translation>Listar propiedades...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="403"/> <source>List properties of the project files</source> <translation>Listar propiedades de los archivos del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation><b>Listar Propiedades</b><p>Lista las propiedades de los archivos del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/> <source>Delete Property</source> <translation>Borrar propiedad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/> <source>Delete Property...</source> <translation>Borrar propiedad...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> + <source>Delete a property for the project files</source> + <translation>Borrar una propiedad de los archivos del proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="420"/> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation><b>Borrar Propiedad</b><p>Borra una propiedad de los archivos del proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/> + <source>Relocate</source> + <translation>Trasladar (relocate)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/> + <source>Relocate...</source> + <translation>Trasladar (relocate)...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> - <source>Delete a property for the project files</source> - <translation>Borrar una propiedad de los archivos del proyecto</translation> + <source>Relocate the working copy to a new repository URL</source> + <translation>Trasladar la copia de trabajo a una nueva URL de repositorio</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation><b>Borrar Propiedad</b><p>Borra una propiedad de los archivos del proyecto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/> - <source>Relocate</source> - <translation>Trasladar (relocate)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/> - <source>Relocate...</source> - <translation>Trasladar (relocate)...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> - <source>Relocate the working copy to a new repository URL</source> - <translation>Trasladar la copia de trabajo a una nueva URL de repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>Trasladar (relocate)</b><p>Traslada la copia de trabajo a una nueva URL de repositorio.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/> + <source>Repository Browser</source> + <translation>Navegador de Repositorios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/> + <source>Repository Browser...</source> + <translation>Navegador de Repositorios...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> + <source>Show the Repository Browser dialog</source> + <translation>Mostrar diálogo de Navegador de Repositorios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation><b>Navegador de Repositorios</b><p>Muestra el diálogo de Navegador de Repositorios.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> - <source>Repository Browser</source> - <translation>Navegador de Repositorios</translation> + <source>Configure</source> + <translation>Configurar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> - <source>Repository Browser...</source> - <translation>Navegador de Repositorios...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="463"/> - <source>Show the Repository Browser dialog</source> - <translation>Mostrar diálogo de Navegador de Repositorios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="466"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation><b>Navegador de Repositorios</b><p>Muestra el diálogo de Navegador de Repositorios.</p></translation> + <source>Configure...</source> + <translation>Configurar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="462"/> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation>Mostrar el diálogo de configuración con la página de Subversion seleccionada</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="465"/> + <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> + <translation><b>Configurar</b><p>Mostrar el diálogo de configuración con la página de Subversion seleccionada.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/> - <source>Configure</source> - <translation>Configurar</translation> + <source>Upgrade</source> + <translation>Actualizar versión</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/> - <source>Configure...</source> - <translation>Configurar...</translation> + <source>Upgrade...</source> + <translation>Actualizar versión...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="477"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation>Mostrar el diálogo de configuración con la página de Subversion seleccionada</translation> + <source>Upgrade the working copy to the current format</source> + <translation>Actualizar la copia de trabajo al formato actual</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="480"/> - <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> - <translation><b>Configurar</b><p>Mostrar el diálogo de configuración con la página de Subversion seleccionada.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/> - <source>Upgrade</source> - <translation>Actualizar versión</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/> - <source>Upgrade...</source> - <translation>Actualizar versión...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="492"/> - <source>Upgrade the working copy to the current format</source> - <translation>Actualizar la copia de trabajo al formato actual</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="495"/> <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation><b>Actualizar versión</b><p>Actualiza la versión de la copia de trabajo al formato actual.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="559"/> <source>Subversion (pysvn)</source> <translation>Subversion (pysvn)</translation> </message> @@ -47513,12 +47693,12 @@ <translation>Añadir...</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="58"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="68"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="117"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="132"/> <source>Add Documentation</source> <translation>Añadir Documentación</translation> </message> @@ -47528,7 +47708,7 @@ <translation>Archivos de Ayuda Comprimidos de Qt (*.qch)</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="152"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="167"/> <source>Remove Documentation</source> <translation>Eliminar Documentación</translation> </message> @@ -47538,40 +47718,50 @@ <translation>Pulse para seleccionar documentos de QtHelp para añadir a la base de datos</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="55"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="65"/> <source>Press to remove the selected documents from the database</source> <translation>Pulse para eliminar los documentos seleccionados de la base de datos</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="137"/> - <source>Do you really want to remove the selected documentation sets from the database?</source> - <translation>¿Realmente desea eliminar los conjuntos de documentación seleccionados de la base de datos?</translation> - </message> - <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="107"/> - <source>The file <b>{0}</b> is not a valid Qt Help File.</source> - <translation>El archivo <b>{0}</b> no es un Archivo de Ayuda de Qt válido.</translation> - </message> - <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="117"/> - <source>The namespace <b>{0}</b> is already registered.</source> - <translation>El espacio de nombres <b>{0}</b> ya esta registrado.</translation> - </message> - <message> <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="152"/> + <source>Do you really want to remove the selected documentation sets from the database?</source> + <translation>¿Realmente desea eliminar los conjuntos de documentación seleccionados de la base de datos?</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="122"/> + <source>The file <b>{0}</b> is not a valid Qt Help File.</source> + <translation>El archivo <b>{0}</b> no es un Archivo de Ayuda de Qt válido.</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="132"/> + <source>The namespace <b>{0}</b> is already registered.</source> + <translation>El espacio de nombres <b>{0}</b> ya esta registrado.</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="167"/> <source>Some documents currently opened reference the documentation you are attempting to remove. Removing the documentation will close those documents. Remove anyway?</source> <translation>Algunos documentos actualmente abiertos hacen referencia a la documentación que está tratando de eliminar. La eliminación de la documentación cerrará estos documentos. ¿Desea eliminarlos de todos modos?</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="78"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="55"/> <source>Press to select QtHelp documents provided by a plug-in to add to the database</source> <translation>Pulsar para seleccionar documentos QtHelp proporcionados por un plug-in para añadir a la base de datos</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="81"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="58"/> <source>Add from Plug-ins...</source> <translation>Añadir desde Plug-ins...</translation> </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="85"/> + <source>Select to manage the plug-in provided documentation sets</source> + <translation>Seleccionar para gestionar los conjuntos de documentación proporcionada por el plug in</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="88"/> + <source>Manage Plug-ins...</source> + <translation>Gestionar Plug Ins...</translation> + </message> </context> <context> <name>QtHelpDocumentationSelectionDialog</name> @@ -47585,6 +47775,61 @@ <source>Select the documentation files to be installed:</source> <translation>Seleccionar los archivos de documentación a instalar:</translation> </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="144"/> + <source>Delete Documentation Sets</source> + <translation>Borrar Conjuntos de Documentación</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="91"/> + <source>Shall the selected documentation sets really be deleted?</source> + <translation>¿Seguro que desea borrar los conjuntos de documentación seleccionados?</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="107"/> + <source><p>The documentation set <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> + <translation><p>El conjunto de documentación <b>{0}</b> no se ha podido borrar.</p><p>Razón: {1}</p></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="126"/> + <source>Shall the selected documentation set categories really be deleted?</source> + <translation>¿Seguro que desea borrar las categorías de conjuntos de documentación seleccionados?</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="144"/> + <source>Shall all documentation sets really be deleted?</source> + <translation>¿Seguro que desea borrar todos los conjuntos de documentación?</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="56"/> + <source>Press to delete the selected documentation sets</source> + <translation>Pulsar para borrar los conjuntos de documentación seleccionados</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="59"/> + <source>Delete</source> + <translation>Borrar</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="66"/> + <source>Press to delete the selected category</source> + <translation>Pulsar para borrar la categoría seleccionada</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="69"/> + <source>Delete Categories</source> + <translation>Borrar Categorías</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="76"/> + <source>Press to delete all entries</source> + <translation>Pulsar para borrar todas las entradas</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="79"/> + <source>Delete All</source> + <translation>Borrar todas</translation> + </message> </context> <context> <name>QtHelpFiltersDialog</name> @@ -47634,7 +47879,7 @@ <translation>Pulsar para eliminar los filtros seleccionados</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="150"/> + <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="89"/> <source>Remove Filters</source> <translation>Eliminar Filtros</translation> </message> @@ -47644,7 +47889,7 @@ <translation>Pulsar para eliminar los atributos seleccionados</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="178"/> + <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="99"/> <source>Remove Attributes</source> <translation>Eliminar Atributos</translation> </message> @@ -48857,6 +49102,19 @@ </message> </context> <context> + <name>RestructuredTextProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/RestructuredTextProvider.py" line="411"/> + <source>Create List</source> + <translation>Crear Lista</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/RestructuredTextProvider.py" line="411"/> + <source>Enter desired number of list elements:</source> + <translation>Introducir número de elementos deseados en la lista:</translation> + </message> +</context> +<context> <name>SafariImporter</name> <message> <location filename="../WebBrowser/Bookmarks/BookmarksImporters/SafariImporter.py" line="44"/> @@ -49154,7 +49412,7 @@ <context> <name>SendRefererWhitelistDialog</name> <message> - <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.py" line="52"/> + <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.ui" line="14"/> <source>Send Referer Whitelist</source> <translation>Enviar Lista Blanca de Referers</translation> </message> @@ -50364,7 +50622,7 @@ <translation>Copiar y Vista &Preliminar</translation> </message> <message> - <location filename="../Snapshot/SnapWidget.py" line="531"/> + <location filename="../Snapshot/SnapWidget.ui" line="20"/> <source>eric6 Snapshot</source> <translation>Captura de Pantalla de eric6</translation> </message> @@ -51938,7 +52196,7 @@ <context> <name>Subversion</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1984"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1964"/> <source>The svn process did not finish within 30s.</source> <translation>El proceso svn no terminó en un plazo de 30s.</translation> </message> @@ -52023,117 +52281,107 @@ <translation>Eliminando archivos/directorios del repositorio Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/> <source>Subversion Error</source> <translation>Error de Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="951"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>La URL del repositorio del proyecto no ha podido recuperarse de la copia de trabajo. La operación tag se abortará</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="998"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="978"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>La URL del repositorio del proyecto tiene un formato no válido. La operación tag se abortará</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1056"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1093"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1073"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>La URL del repositorio del proyecto no ha podido recuperarse de la copia de trabajo. La operación switch se abortará</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>La URL del repositorio del proyecto tiene un formato no válido. La operación switch se abortará</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1512"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1492"/> <source>Subversion command</source> <translation>Comando de Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1684"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1664"/> <source>Resolving conficts</source> <translation>Resolviendo conflictos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1779"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1759"/> <source>Subversion Set Property</source> <translation>Asignar Propiedad de Subversion</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1781"/> + <source>You have to supply a property name. Aborting.</source> + <translation>Tiene que proporcionar un nombre de propiedad. Abortando.</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1801"/> - <source>You have to supply a property name. Aborting.</source> - <translation>Tiene que proporcionar un nombre de propiedad. Abortando.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1821"/> <source>Subversion Delete Property</source> <translation>Borrar Propiedad de Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1791"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1771"/> <source>Enter property name</source> <translation>Introducir nombre de la propiedad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> - <source>Subversion Log</source> - <translation>Log de Subversion</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> - <source>Select number of entries to show.</source> - <translation>Seleccionar número de entradas a mostrar.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2080"/> <source>Locking in the Subversion repository</source> <translation>Bloqueando en el repositorio Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2108"/> <source>Unlocking in the Subversion repository</source> <translation>Desbloqueando en el repositorio Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1923"/> <source>Property set.</source> <translation>Propiedad establecida.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1997"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1976"/> <source>Property deleted.</source> <translation>Propiedad borrada.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/> <source>Subversion Lock</source> <translation>Bloqueo de Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/> <source>Enter lock comment</source> <translation>Introducir comentario para el bloqueo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2153"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2133"/> <source>Relocating</source> <translation>Realojando</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/> <source>Repository Browser</source> <translation>Navegador de Repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/> <source>Enter the repository URL.</source> <translation>Introducir la URL del repositorio.</translation> </message> @@ -52288,17 +52536,17 @@ <translation>Sin versionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2221"/> <source>Remove from changelist</source> <translation>Quitar de la lista de cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/> <source>Add to changelist</source> <translation>Añadir a la lista de cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/> <source>Enter name of the changelist:</source> <translation>Introduzca el nombre de la lista de cambios:</translation> </message> @@ -52328,27 +52576,27 @@ <translation>Moviendo {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1033"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1013"/> <source>Tagging {0} in the Subversion repository</source> <translation>Haciendo un tag {0} en el repositorio Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1151"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1131"/> <source>Switching to {0}</source> <translation>Haciendo un switch a {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1196"/> <source>Merging {0}</source> <translation>Haciendo un merge de {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1482"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1462"/> <source>Cleaning up {0}</source> <translation>Limpiando {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1695"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> @@ -52364,7 +52612,7 @@ <translation>Commit realizado para revisión {0}.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1255"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1234"/> <source>Revision {0}. </source> <translation>Revisión {0}.</translation> @@ -52380,37 +52628,37 @@ <translation>La operación de commit afecta a archivos que tienen cambios sin guardar. ¿Continuar con la operación de commit?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1042"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation>¿Realmente desea revertir todos los cambios a estos archivos o directorios?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/> <source>Do you really want to revert all changes of the project?</source> <translation>¿Realmente desea revertir todos los cambios del proyecto?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1987"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1967"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/> <source>Subversion Side-by-Side Difference</source> <translation>Diferencia Lado a Lado Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo <b>{0}</b> no se ha podido leer.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2305"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2285"/> <source>Upgrade</source> <translation>Actualizar versión</translation> </message> @@ -52975,7 +53223,7 @@ <context> <name>SvnDiffDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="14"/> <source>Subversion Diff</source> <translation>Diff de Subversion</translation> </message> @@ -53278,17 +53526,17 @@ <translation>Seleccione el campo de filtrado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="112"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="117"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="127"/> <source>Message</source> <translation>Mensaje</translation> </message> @@ -53348,257 +53596,130 @@ <translation>Detener en copy/move</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="261"/> <source>Press to generate a diff to the previous revision</source> <translation>Pulse para generar un diff con la anterior revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="264"/> <source>&Diff to Previous</source> <translation>&Diff con la anterior</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="271"/> <source>Press to compare two revisions</source> <translation>Pulse para comparar dos revisiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="254"/> - <source>&Compare Revisions</source> - <translation>&Comparar Revisiones</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="292"/> - <source>Errors</source> - <translation>Errores</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="298"/> - <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> - <translation><b>Errores de Subversion log</b><p>Muestra los posibles mensajes de error del comando svn log.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="314"/> - <source>Input</source> - <translation>Input</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="336"/> - <source>Press to send the input to the subversion process</source> - <translation>Pulsar para enviar el input al proceso de subversion</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/> - <source>&Send</source> - <translation>&Enviar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/> - <source>Alt+S</source> - <translation>Alt+E</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="349"/> - <source>Enter data to be sent to the subversion process</source> - <translation>Introducir datos a enviar al proceso de subversion</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> - <source>Select to switch the input field to password mode</source> - <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> - <source>&Password Mode</source> - <translation>&Modo de contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> - <source>Alt+P</source> - <translation>Alt+M</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="89"/> - <source>Added</source> - <translation>Añadido</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="90"/> - <source>Deleted</source> - <translation>Borrado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="91"/> - <source>Modified</source> - <translation>Modificado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="504"/> - <source>Subversion Error</source> - <translation>Error de Subversion</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> - <source>Process Generation Error</source> - <translation>Error de Generación de Proceso</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="92"/> - <source>Replaced</source> - <translation>Reemplazado</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> - <source>Select to show differences side-by-side</source> - <translation>Seleccionar para mostrar diferencias lado a lado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="277"/> - <source>Show differences side-by-side</source> - <translation>Mostrar diferencias lado a lado</translation> - </message> -</context> -<context> - <name>SvnLogDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="14"/> - <source>Subversion Log</source> - <translation>Log de Subversion</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="26"/> - <source>Log</source> - <translation>Log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="32"/> - <source><b>Subversion Log</b><p>This shows the output of the svn log command. By clicking on the links you may show the difference between versions.</p></source> - <translation><b>Log de Subversion</b><p>Muestra la salida del comando svn log. Haciendo click en los enlaces se muestran las diferencias entre versiones.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="58"/> + <source>&Compare Revisions</source> + <translation>&Comparar Revisiones</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="312"/> <source>Errors</source> <translation>Errores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="64"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="318"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> <translation><b>Errores de Subversion log</b><p>Muestra los posibles mensajes de error del comando svn log.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="80"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="334"/> <source>Input</source> <translation>Input</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> <source>Press to send the input to the subversion process</source> <translation>Pulsar para enviar el input al proceso de subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> <source>&Send</source> <translation>&Enviar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="108"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> <source>Alt+S</source> <translation>Alt+E</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="369"/> <source>Enter data to be sent to the subversion process</source> <translation>Introducir datos a enviar al proceso de subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="122"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="376"/> <source>Select to switch the input field to password mode</source> <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="379"/> <source>&Password Mode</source> <translation>&Modo de contraseña</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="382"/> <source>Alt+P</source> <translation>Alt+M</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="55"/> - <source><b>Processing your request, please wait...</b></source> - <translation><b>Procesando la solicitud, por favor aguarde...</b></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="81"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="93"/> <source>Added</source> <translation>Añadido</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="82"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="94"/> <source>Deleted</source> <translation>Borrado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="83"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="95"/> <source>Modified</source> <translation>Modificado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="87"/> - <source>revision</source> - <translation>Revisión</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="527"/> + <source>Subversion Error</source> + <translation>Error de Subversion</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="313"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="313"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="193"/> - <source>diff to {0}</source> - <translation>diff con {0}</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="202"/> - <source><i>author: {0}</i><br /> -</source> - <translation><i>autor: {0}</i><br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="205"/> - <source><i>date: {0}</i><br /> -</source> - <translation><i>Fecha: {0}</i><br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="191"/> - <source> (copied from {0}, revision {1})</source> - <translation> (copiado de {0}, revisión {1})</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="42"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="96"/> + <source>Replaced</source> + <translation>Reemplazado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="294"/> <source>Select to show differences side-by-side</source> <translation>Seleccionar para mostrar diferencias lado a lado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="297"/> <source>Show differences side-by-side</source> <translation>Mostrar diferencias lado a lado</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <source>Press to move up in the log list</source> + <translation>Pulsar para mover hacia arriba en el listado de log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <source>Press to move down in the log list</source> + <translation>Pulsar para mover hacia abajo en el listado de log</translation> + </message> </context> <context> <name>SvnLoginDialog</name> @@ -53743,7 +53864,7 @@ <translation>&Protocolo:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -53843,7 +53964,7 @@ <translation>Seleccionar el protocolo para acceder al repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -53888,177 +54009,172 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="634"/> <source>Version Control</source> <translation>Control de Versiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="654"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="646"/> <source>Update from repository</source> <translation>Hacer update desde repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="658"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="650"/> <source>Commit changes to repository...</source> <translation>Hacer commit de los cambios al repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="656"/> <source>Add to repository</source> <translation>Añadir al repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="385"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="381"/> <source>Add tree to repository</source> <translation>Añadir árbol al repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="660"/> <source>Remove from repository (and disk)</source> <translation>Eliminar del repositorio (y del disco)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="566"/> - <source>Show log</source> - <translation>Mostrar log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="684"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="676"/> <source>Show status</source> <translation>Mostrar estado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="286"/> <source>Show annotated file</source> <translation>Mostrar archivo anotado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="696"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="700"/> + <source>Merge changes</source> + <translation>Hacer merge de los cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="430"/> + <source>Lock</source> + <translation>Bloquear</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="434"/> + <source>Unlock</source> + <translation>Desbloquear</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="438"/> + <source>Break Lock</source> + <translation>Romper bloqueo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="442"/> + <source>Steal Lock</source> + <translation>Robar bloqueo</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="708"/> - <source>Merge changes</source> - <translation>Hacer merge de los cambios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="434"/> - <source>Lock</source> - <translation>Bloquear</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="438"/> - <source>Unlock</source> - <translation>Desbloquear</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="442"/> - <source>Break Lock</source> - <translation>Romper bloqueo</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="446"/> - <source>Steal Lock</source> - <translation>Robar bloqueo</translation> + <source>Set Property</source> + <translation>Establecer propiedad</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="710"/> + <source>List Properties</source> + <translation>Listar propiedades</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="713"/> + <source>Delete Property</source> + <translation>Borrar propiedad</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="716"/> - <source>Set Property</source> - <translation>Establecer propiedad</translation> + <source>Select all local file entries</source> + <translation>Seleccionar todas las entradas de archivo locales</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="718"/> - <source>List Properties</source> - <translation>Listar propiedades</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="721"/> - <source>Delete Property</source> - <translation>Borrar propiedad</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="724"/> - <source>Select all local file entries</source> - <translation>Seleccionar todas las entradas de archivo locales</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="726"/> <source>Select all versioned file entries</source> <translation>Seleccionar todas las entradas de archivo versionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="720"/> <source>Select all local directory entries</source> <translation>Seleccionar todas las entradas de directorio locales</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="730"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="722"/> <source>Select all versioned directory entries</source> <translation>Seleccionar todas las entradas de directorio versionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="572"/> <source>Show repository info</source> <translation>Mostrar informacion del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="562"/> <source>Show log browser</source> <translation>Mostrar navegador de log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="733"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="725"/> <source>Configure...</source> <translation>Configurar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="667"/> <source>Add to Changelist</source> <translation>Añadir a la lista de cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="679"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="671"/> <source>Remove from Changelist</source> <translation>Quitar de la lista de cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="547"/> <source>Copy</source> <translation>Copiar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="549"/> <source>Move</source> <translation>Mover</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="681"/> <source>Show differences</source> <translation>Mostrar diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="271"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="267"/> <source>Show differences side-by-side</source> <translation>Mostrar diferencias lado a lado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="693"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="685"/> <source>Show differences (extended)</source> <translation>Mostrar diferencias (extendido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="276"/> <source>Show differences side-by-side (extended)</source> <translation>Mostrar diferencias lado a lado (extendido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="698"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="690"/> <source>Show differences (URLs)</source> <translation>Mostrar diferencias (URLs)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="712"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/> <source>Conflicts resolved</source> <translation>Conflictos resueltos</translation> </message> @@ -54127,506 +54243,486 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/> - <source>Show log</source> - <translation>Mostrar log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/> - <source>Show &log</source> - <translation>Mostrar &log</translation> + <source>Show log browser</source> + <translation>Mostrar navegador de log</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="104"/> - <source>Show the log of the local project</source> - <translation>Mostrar el log del proyecto local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="107"/> - <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation><b>Mostrar log</b><p>Muestra el log del proyecto local.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="131"/> + <source>Show a dialog to browse the log of the local project</source> + <translation>Mostrar un diálogo para navegar el log del proyecto local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/> <source>Show &difference</source> <translation>Mostrar &diferencia</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="121"/> <source>Show the difference of the local project to the repository</source> <translation>Muestra las diferencias entre el proyecto local y el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="137"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Muestra la diferencia de revisiones entre el proyecto local y el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="153"/> <source>Show the difference of the project between two repository URLs</source> <translation>Muestra la diferencia de revisiones entre dos URLs de repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="164"/> <source>Show status</source> <translation>Mostrar estado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="164"/> <source>Show &status</source> <translation>Mostrar e&stado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="169"/> <source>Show the status of the local project</source> <translation>Mostrar el estado del proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="172"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Mostrar estado</b><p>Muestra el estado del proyecto local.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="195"/> + <source>Tag in repository</source> + <translation>Crear un Tag en el repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="195"/> + <source>&Tag in repository...</source> + <translation>Crear un &Tag en el repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="200"/> + <source>Tag the local project in the repository</source> + <translation>Crea un tag del proyecto local en el repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="203"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="210"/> - <source>Tag in repository</source> - <translation>Crear un Tag en el repositorio</translation> + <source>Export from repository</source> + <translation>Exportar desde repositorio</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="210"/> - <source>&Tag in repository...</source> - <translation>Crear un &Tag en el repositorio...</translation> + <source>&Export from repository...</source> + <translation>&Exportar desde repositorio...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="215"/> - <source>Tag the local project in the repository</source> - <translation>Crea un tag del proyecto local en el repositorio</translation> + <source>Export a project from the repository</source> + <translation>Exportar un proyecto desde el repositorio</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="218"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>Exportar desde repositorio</b><p>Exporta un proyecto desde el repositorio.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/> + <source>Command options</source> + <translation>Opciones de comando</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/> - <source>Export from repository</source> - <translation>Exportar desde repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/> - <source>&Export from repository...</source> - <translation>&Exportar desde repositorio...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="230"/> - <source>Export a project from the repository</source> - <translation>Exportar un proyecto desde el repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="233"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation><b>Exportar desde repositorio</b><p>Exporta un proyecto desde el repositorio.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="240"/> - <source>Command options</source> - <translation>Opciones de comando</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="240"/> <source>Command &options...</source> <translation>&Opciones de comando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="229"/> <source>Show the VCS command options</source> <translation>Mostrar opciones de comando VCS</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="231"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation><b>Opciones de comando...</b><p>Muestra un diálogo para editar las opciones de comando VCS.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="238"/> + <source>Revert changes</source> + <translation>Revertir cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="238"/> + <source>Re&vert changes</source> + <translation>Re&vertir cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="243"/> + <source>Revert all changes made to the local project</source> + <translation>Revertir todos los cambios hechos al proyecto local</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="246"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation><b>Opciones de comando...</b><p>Muestra un diálogo para editar las opciones de comando VCS.</p></translation> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation><b>Revertir cambios</b><p>Revierte todos los cambios hechos al proyecto local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/> + <source>Merge</source> + <translation>Hacer merge</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/> - <source>Revert changes</source> - <translation>Revertir cambios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/> - <source>Re&vert changes</source> - <translation>Re&vertir cambios</translation> + <source>Mer&ge changes...</source> + <translation>Hacer mer&ge de los cambios...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="258"/> - <source>Revert all changes made to the local project</source> - <translation>Revertir todos los cambios hechos al proyecto local</translation> + <source>Merge changes of a tag/revision into the local project</source> + <translation>Hacer merge de los cambios de una tag/revision en el proyecto local</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="261"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation><b>Revertir cambios</b><p>Revierte todos los cambios hechos al proyecto local.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="268"/> - <source>Merge</source> - <translation>Hacer merge</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="268"/> - <source>Mer&ge changes...</source> - <translation>Hacer mer&ge de los cambios...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="273"/> - <source>Merge changes of a tag/revision into the local project</source> - <translation>Hacer merge de los cambios de una tag/revision en el proyecto local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="276"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Merge</b><p>Hace un merge de los cambios de una tag/revision al proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="269"/> <source>Switch</source> <translation>Hacer switch</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="269"/> + <source>S&witch...</source> + <translation>Hacer s&witch...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="274"/> + <source>Switch the local copy to another tag/branch</source> + <translation>Hace un switch de la copia local a otra tag/branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="277"/> + <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> + <translation><b>Hacer switch</b><p>Hace un switch de la copia local a otra tag/branch.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> + <source>Cleanup</source> + <translation>Limpiar (cleanup)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> + <source>Cleanu&p</source> + <translation>Lim&piar (cleanup)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="303"/> + <source>Cleanup the local project</source> + <translation>Hacer limpieza (cleanup) del proyecto local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="306"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Limpieza (cleanup)</b><p>Ejecuta un cleanup del proyecto local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="313"/> + <source>Execute command</source> + <translation>Ejecutar comando</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="313"/> + <source>E&xecute command...</source> + <translation>E&jecutar comando...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="317"/> + <source>Execute an arbitrary VCS command</source> + <translation>Ejecuta un comando VCS arbitrario</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="320"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> + <translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando VCS arbitrario.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="327"/> + <source>List tags</source> + <translation>Listar tags</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="327"/> + <source>List tags...</source> + <translation>Listar tags...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="331"/> + <source>List tags of the project</source> + <translation>Lista los tags del proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="334"/> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Listar tags</b><p>Lista los tags del proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="341"/> + <source>List branches</source> + <translation>Listar branches</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="341"/> + <source>List branches...</source> + <translation>Listar branches...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="345"/> + <source>List branches of the project</source> + <translation>Lista las branches del proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="348"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="355"/> + <source>List repository contents</source> + <translation>Listar contenido del repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="355"/> + <source>List repository contents...</source> + <translation>Listar contenido del repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="359"/> + <source>Lists the contents of the repository</source> + <translation>Lista el contenido del repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="362"/> + <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> + <translation><b>Listar contenido del repositorio</b><p>Lista el contenido del repositorio.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="369"/> + <source>Set Property</source> + <translation>Establecer propiedad</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="369"/> + <source>Set Property...</source> + <translation>Establecer propiedad...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="373"/> + <source>Set a property for the project files</source> + <translation>Establece una propiedad para los archivos del proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="376"/> + <source><b>Set Property</b><p>This sets a property for the project files.</p></source> + <translation><b>Establecer Propiedad</b><p>Establece una propiedad para los archivos del proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="383"/> + <source>List Properties</source> + <translation>Listar propiedades</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="383"/> + <source>List Properties...</source> + <translation>Listar propiedades...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="387"/> + <source>List properties of the project files</source> + <translation>Listar propiedades de los archivos del proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="390"/> + <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> + <translation><b>Listar Propiedades</b><p>Lista las propiedades de los archivos del proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="397"/> + <source>Delete Property</source> + <translation>Borrar propiedad</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="397"/> + <source>Delete Property...</source> + <translation>Borrar propiedad...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="401"/> + <source>Delete a property for the project files</source> + <translation>Borrar una propiedad de los archivos del proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="404"/> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation><b>Borrar Propiedad</b><p>Borra una propiedad de los archivos del proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/> + <source>Relocate</source> + <translation>Trasladar (relocate)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/> + <source>Relocate...</source> + <translation>Trasladar (relocate)...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="416"/> + <source>Relocate the working copy to a new repository URL</source> + <translation>Trasladar la copia de trabajo a una nueva URL de repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="419"/> + <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> + <translation><b>Trasladar (relocate)</b><p>Traslada la copia de trabajo a una nueva URL de repositorio.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="427"/> + <source>Repository Browser</source> + <translation>Navegador de Repositorios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="427"/> + <source>Repository Browser...</source> + <translation>Navegador de Repositorios...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="432"/> + <source>Show the Repository Browser dialog</source> + <translation>Mostrar diálogo de Navegador de Repositorios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="435"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation><b>Navegador de Repositorios</b><p>Muestra el diálogo de Navegador de Repositorios.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="107"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation><b>Mostrar navegador de log</b><p>Muestra un diálogo para navegar el log del proyecto local. Al principio se muestra un número limitado de entradas. Se pueden recuperar más entradas despues.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> + <source>Configure</source> + <translation>Configurar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> + <source>Configure...</source> + <translation>Configurar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="446"/> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation>Mostrar el diálogo de configuración con la página de Subversion seleccionada</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="449"/> + <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> + <translation><b>Configurar</b><p>Mostrar el diálogo de configuración con la página de Subversion seleccionada.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> - <source>S&witch...</source> - <translation>Hacer s&witch...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="289"/> - <source>Switch the local copy to another tag/branch</source> - <translation>Hace un switch de la copia local a otra tag/branch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="292"/> - <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> - <translation><b>Hacer switch</b><p>Hace un switch de la copia local a otra tag/branch.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="314"/> - <source>Cleanup</source> - <translation>Limpiar (cleanup)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="314"/> - <source>Cleanu&p</source> - <translation>Lim&piar (cleanup)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="318"/> - <source>Cleanup the local project</source> - <translation>Hacer limpieza (cleanup) del proyecto local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="321"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Limpieza (cleanup)</b><p>Ejecuta un cleanup del proyecto local.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="328"/> - <source>Execute command</source> - <translation>Ejecutar comando</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="328"/> - <source>E&xecute command...</source> - <translation>E&jecutar comando...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="332"/> - <source>Execute an arbitrary VCS command</source> - <translation>Ejecuta un comando VCS arbitrario</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="335"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> - <translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando VCS arbitrario.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="342"/> - <source>List tags</source> - <translation>Listar tags</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="342"/> - <source>List tags...</source> - <translation>Listar tags...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="346"/> - <source>List tags of the project</source> - <translation>Lista los tags del proyecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="349"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Listar tags</b><p>Lista los tags del proyecto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="356"/> - <source>List branches</source> - <translation>Listar branches</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="356"/> - <source>List branches...</source> - <translation>Listar branches...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="360"/> - <source>List branches of the project</source> - <translation>Lista las branches del proyecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="363"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="370"/> - <source>List repository contents</source> - <translation>Listar contenido del repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="370"/> - <source>List repository contents...</source> - <translation>Listar contenido del repositorio...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="374"/> - <source>Lists the contents of the repository</source> - <translation>Lista el contenido del repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="377"/> - <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> - <translation><b>Listar contenido del repositorio</b><p>Lista el contenido del repositorio.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="384"/> - <source>Set Property</source> - <translation>Establecer propiedad</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="384"/> - <source>Set Property...</source> - <translation>Establecer propiedad...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="388"/> - <source>Set a property for the project files</source> - <translation>Establece una propiedad para los archivos del proyecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="391"/> - <source><b>Set Property</b><p>This sets a property for the project files.</p></source> - <translation><b>Establecer Propiedad</b><p>Establece una propiedad para los archivos del proyecto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="398"/> - <source>List Properties</source> - <translation>Listar propiedades</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="398"/> - <source>List Properties...</source> - <translation>Listar propiedades...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="402"/> - <source>List properties of the project files</source> - <translation>Listar propiedades de los archivos del proyecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="405"/> - <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> - <translation><b>Listar Propiedades</b><p>Lista las propiedades de los archivos del proyecto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="412"/> - <source>Delete Property</source> - <translation>Borrar propiedad</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="412"/> - <source>Delete Property...</source> - <translation>Borrar propiedad...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="416"/> - <source>Delete a property for the project files</source> - <translation>Borrar una propiedad de los archivos del proyecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="419"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation><b>Borrar Propiedad</b><p>Borra una propiedad de los archivos del proyecto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="426"/> - <source>Relocate</source> - <translation>Trasladar (relocate)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="426"/> - <source>Relocate...</source> - <translation>Trasladar (relocate)...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="431"/> - <source>Relocate the working copy to a new repository URL</source> - <translation>Trasladar la copia de trabajo a una nueva URL de repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="434"/> - <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> - <translation><b>Trasladar (relocate)</b><p>Traslada la copia de trabajo a una nueva URL de repositorio.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> - <source>Repository Browser</source> - <translation>Navegador de Repositorios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> - <source>Repository Browser...</source> - <translation>Navegador de Repositorios...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="447"/> - <source>Show the Repository Browser dialog</source> - <translation>Mostrar diálogo de Navegador de Repositorios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="450"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation><b>Navegador de Repositorios</b><p>Muestra el diálogo de Navegador de Repositorios.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="114"/> - <source>Show log browser</source> - <translation>Mostrar navegador de log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="119"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>Mostrar un diálogo para navegar el log del proyecto local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="122"/> - <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> - <translation><b>Mostrar navegador de log</b><p>Muestra un diálogo para navegar el log del proyecto local. Al principio se muestra un número limitado de entradas. Se pueden recuperar más entradas despues.</p></translation> + <source>Conflicts resolved</source> + <translation>Conflictos resueltos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> + <source>Con&flicts resolved</source> + <translation>Con&flictos resueltos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="288"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation>Marcar todos los conflictos del proyecto local como resueltos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="291"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation><b>Conflictos resueltos</b><p>Marca todos los conflictos del proyecto local como resueltos.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <source>Show change lists</source> + <translation>Mostrar listas de cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="184"/> + <source>Show the change lists and associated files of the local project</source> + <translation>Mostrar las listas de cambios y los archivos asociados del proyecto local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="187"/> + <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> + <translation><b>Mostrar listas de cambios</b><p>Muestra las listas de cambios y los archivos asociados del proyecto local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> + <source>Upgrade</source> + <translation>Actualizar versión</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> - <source>Configure</source> - <translation>Configurar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> - <source>Configure...</source> - <translation>Configurar...</translation> + <source>Upgrade...</source> + <translation>Actualizar versión...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="461"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation>Mostrar el diálogo de configuración con la página de Subversion seleccionada</translation> + <source>Upgrade the working copy to the current format</source> + <translation>Actualizar la copia de trabajo al formato actual</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="464"/> - <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> - <translation><b>Configurar</b><p>Mostrar el diálogo de configuración con la página de Subversion seleccionada.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> - <source>Conflicts resolved</source> - <translation>Conflictos resueltos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> - <source>Con&flicts resolved</source> - <translation>Con&flictos resueltos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="303"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation>Marcar todos los conflictos del proyecto local como resueltos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="306"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation><b>Conflictos resueltos</b><p>Marca todos los conflictos del proyecto local como resueltos.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="194"/> - <source>Show change lists</source> - <translation>Mostrar listas de cambios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="199"/> - <source>Show the change lists and associated files of the local project</source> - <translation>Mostrar las listas de cambios y los archivos asociados del proyecto local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="202"/> - <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> - <translation><b>Mostrar listas de cambios</b><p>Muestra las listas de cambios y los archivos asociados del proyecto local.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="472"/> - <source>Upgrade</source> - <translation>Actualizar versión</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="472"/> - <source>Upgrade...</source> - <translation>Actualizar versión...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="476"/> - <source>Upgrade the working copy to the current format</source> - <translation>Actualizar la copia de trabajo al formato actual</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="479"/> <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation><b>Actualizar versión</b><p>Actualiza la versión de la copia de trabajo al formato actual.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/> <source>Show differences</source> <translation>Mostrar diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="132"/> <source>Show differences (extended)</source> <translation>Mostrar diferencias (extendido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="148"/> <source>Show differences (URLs)</source> <translation>Mostrar diferencias (URLs)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="124"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation><b>Mostrar diferencias</b><p>Muestra diferencias entre el proyecto local y el repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="140"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation><b>Mostrar difefencias (extendido)</b><p>Muestra diferencias entre revisiones seleccionables del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="156"/> <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> <translation><b>Mostrar diferencias (URLs)</b><p>Muestra diferencias para el proyecto entre dos URLs de repositorios.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="559"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="543"/> <source>Subversion (svn)</source> <translation>Subversion (svn)</translation> </message> @@ -55053,7 +55149,7 @@ <context> <name>SvnStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="394"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="14"/> <source>Subversion Status</source> <translation>Estado de Subversion</translation> </message> @@ -55310,7 +55406,7 @@ <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="711"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="80"/> <source>Commit</source> <translation>Commit</translation> </message> @@ -58870,22 +58966,22 @@ <translation>Todo</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="66"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="62"/> <source>Language:</source> <translation>Lenguaje:</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="70"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="69"/> <source>GROUP</source> <translation>GROUP</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="103"/> <source>Close dialog</source> <translation>Cerrar diálogo</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="103"/> <source>Do you really want to close the dialog?</source> <translation>¿Realmente desea cerrar el diálogo?</translation> </message> @@ -60552,7 +60648,7 @@ <context> <name>UnittestDialog</name> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.ui" line="14"/> <source>Unittest</source> <translation>Test Unitario</translation> </message> @@ -60739,57 +60835,57 @@ <translation>^Error:</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="266"/> + <location filename="../PyUnit/UnittestDialog.py" line="269"/> <source>You must enter a test suite file.</source> <translation>Debe introducir un archivo de suite de tests.</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="274"/> + <location filename="../PyUnit/UnittestDialog.py" line="277"/> <source>Preparing Testsuite</source> <translation>Preparando Suite de Tests</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="469"/> + <location filename="../PyUnit/UnittestDialog.py" line="475"/> <source>Running</source> <translation>Ejecutando</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="634"/> + <location filename="../PyUnit/UnittestDialog.py" line="640"/> <source>Show Source</source> <translation>Mostrar código fuente</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="206"/> + <location filename="../PyUnit/UnittestDialog.py" line="209"/> <source>Python Files (*.py);;All Files (*)</source> <translation>Archivos Python (*.py);;Todos los Archivos (*)</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="202"/> + <location filename="../PyUnit/UnittestDialog.py" line="205"/> <source>Python3 Files ({1});;Python2 Files ({0});;All Files (*)</source> <translation>Archivos Python3 ({1});;Archivos Python2 ({0});;Todos los Archivos (*)</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.py" line="403"/> <source><p>Unable to run test <b>{0}</b>.<br>{1}<br>{2}</p></source> <translation><p>Imposible ejecutar el test <b>{0}</b>.<br>{1}<br>{2}</p></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="493"/> + <location filename="../PyUnit/UnittestDialog.py" line="499"/> <source>Ran {0} test in {1:.3f}s</source> <translation>Se ha ejecutado {0} test en {1:.3f}s</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="497"/> + <location filename="../PyUnit/UnittestDialog.py" line="503"/> <source>Ran {0} tests in {1:.3f}s</source> <translation>Se han ejecutado {0} tests en {1:.3f}s</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="514"/> + <location filename="../PyUnit/UnittestDialog.py" line="520"/> <source>Failure: {0}</source> <translation>Fallido: {0}</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="529"/> + <location filename="../PyUnit/UnittestDialog.py" line="535"/> <source>Error: {0}</source> <translation>Error: {0}</translation> </message> @@ -60824,17 +60920,17 @@ <translation>Número de tests con éxito inesperado</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="544"/> + <location filename="../PyUnit/UnittestDialog.py" line="550"/> <source> Skipped: {0}</source> <translation> Ignorados: {0}</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="559"/> + <location filename="../PyUnit/UnittestDialog.py" line="565"/> <source> Expected Failure</source> <translation> Fallo Esperado</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="573"/> + <location filename="../PyUnit/UnittestDialog.py" line="579"/> <source> Unexpected Success</source> <translation> Éxito Inesperado</translation> </message> @@ -63430,13 +63526,13 @@ </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="38"/> - <source>&Locals Filter</source> - <translation>&Filtro de Locales</translation> + <source>&Locals Viewer</source> + <translation>Visor de &Locales</translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="48"/> - <source>&Globals Filter</source> - <translation>&Filtro de Globales</translation> + <source>&Globals Viewer</source> + <translation>Visor de &Globales</translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="58"/> @@ -63446,9 +63542,9 @@ <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="61"/> <source><b>Locals Filter List</b> -<p>Select the variable types you want to be filtered out of the locals variables list.</p<</source> +<p>Select the variable types you want to be shown in the local variables viewer.</p<</source> <translation><b>Lista de Filtros para Locales</b> -<p>Seleccione de esta lista los tipos de variables locales que desea filtrar.</p></translation> +<p>Seleccionar de esta lista los tipos de variables locales que se desean filtrar.</p></translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="78"/> @@ -63458,15 +63554,20 @@ <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="81"/> <source><b>Globals Filter List</b> -<p>Select the variable types you want to be filtered out of the globals variables list.</p<</source> +<p>Select the variable types you want to be shown in the global variables viewer.</p<</source> <translation><b>Lista de Filtros para Globales</b> -<p>Seleccione de esta lista los tipos de variables globales que desea filtrar.</p></translation> +<p>Seleccionar de esta lista los tipos de variables globales que desean filtrar.</p></translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.py" line="42"/> <source>Save Default</source> <translation>Guardar como 'por defecto'</translation> </message> + <message> + <location filename="../Debugger/VariablesFilterDialog.ui" line="28"/> + <source>Select the variable types to be shown in the variables viewers:</source> + <translation>Seleccionar los tipos de variables a mostrar en los visores de variables:</translation> + </message> </context> <context> <name>VariablesViewer</name> @@ -64042,7 +64143,7 @@ <translation>Actualizar</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="532"/> + <location filename="../VCS/ProjectHelper.py" line="533"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> @@ -64057,7 +64158,7 @@ <translation>El proyecto recuperado del repositorio no contiene un archivo de proyecto de eric (*.e4p). ¿Desea crearlo?</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="532"/> + <location filename="../VCS/ProjectHelper.py" line="533"/> <source>Switch</source> <translation>Hacer switch</translation> </message> @@ -64137,17 +64238,17 @@ <context> <name>VersionControl</name> <message> - <location filename="../VCS/VersionControl.py" line="573"/> + <location filename="../VCS/VersionControl.py" line="563"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../VCS/VersionControl.py" line="704"/> + <location filename="../VCS/VersionControl.py" line="694"/> <source>Repository status checking is switched off</source> <translation>El chequeo de estado del repositorio está deshabilitado</translation> </message> <message> - <location filename="../VCS/VersionControl.py" line="573"/> + <location filename="../VCS/VersionControl.py" line="563"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -71377,17 +71478,17 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiquetas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -71398,31 +71499,31 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Pista</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Padres</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1459"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1426"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Padre #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1446"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -71431,12 +71532,12 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -71453,14 +71554,14 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2078"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Head #{0}</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2083"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Parent #{0}</b></td><td></td></tr> @@ -71968,50 +72069,55 @@ <translation>no comparar tipos, usar 'isinstance()'</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="240"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="243"/> <source>do not assign a lambda expression, use a def</source> <translation>no asignar una expresión lambda, utilizar un def</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="243"/> - <source>ambiguous variable name '{0}'</source> - <translation>nombre de variable ambiguo '{0}'</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="246"/> - <source>ambiguous class definition '{0}'</source> - <translation>definición ambigua de clase '{0}'</translation> + <source>ambiguous variable name '{0}'</source> + <translation>nombre de variable ambiguo '{0}'</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="249"/> - <source>ambiguous function definition '{0}'</source> - <translation>definición ambigua de función '{0}'</translation> + <source>ambiguous class definition '{0}'</source> + <translation>definición ambigua de clase '{0}'</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="252"/> - <source>{0}: {1}</source> - <translation>{0}: {1}</translation> + <source>ambiguous function definition '{0}'</source> + <translation>definición ambigua de función '{0}'</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="255"/> + <source>{0}: {1}</source> + <translation>{0}: {1}</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="258"/> <source>{0}</source> <translation>{0}</translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="240"/> + <source>do not use bare except</source> + <translation>no usar except sin tipo</translation> + </message> </context> <context> <name>subversion</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1741"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1720"/> <source>unknown</source> <translation>desconocido</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1606"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1586"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Información del repositorio</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Revisión actual</b></td><td>{2}</td></tr><tr><td><b>Revisión enviada</b></td><td>{3}</td></tr><tr><td><b>Fecha de envío</b></td><td>{4}</td></tr><tr><td><b>Hora de envío</b></td><td>{5}</td></tr><tr><td><b>Último autor</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1746"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1725"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Information del repositorio</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Revisión enviada</b></td><td>{5}</td></tr><tr><td><b>Fecha de envío</b></td><td>{6}</td></tr><tr><td><b>Hora de envio</b></td><td>{7}</td></tr><tr><td><b>Último autor</b></td><td>{8}</td></tr></table></translation> </message>
diff -r 852016bbdedb -r c307358a2ecc i18n/eric6_fr.ts --- a/i18n/eric6_fr.ts Fri Jan 27 19:18:52 2017 +0100 +++ b/i18n/eric6_fr.ts Fri Feb 03 19:20:59 2017 +0100 @@ -3596,147 +3596,147 @@ <context> <name>CodeStyleFixer</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="494"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> <source>Triple single quotes converted to triple double quotes.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> - <source>Introductory quotes corrected to be {0}"""</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="500"/> - <source>Single line docstring put on one line.</source> + <source>Introductory quotes corrected to be {0}"""</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="503"/> + <source>Single line docstring put on one line.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="506"/> <source>Period added to summary line.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> <source>Blank line before function/method docstring removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="509"/> - <source>Blank line inserted before class docstring.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="512"/> - <source>Blank line inserted after class docstring.</source> + <source>Blank line inserted before class docstring.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="515"/> - <source>Blank line inserted after docstring summary.</source> + <source>Blank line inserted after class docstring.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="518"/> - <source>Blank line inserted after last paragraph of docstring.</source> + <source>Blank line inserted after docstring summary.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="521"/> - <source>Leading quotes put on separate line.</source> + <source>Blank line inserted after last paragraph of docstring.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="524"/> - <source>Trailing quotes put on separate line.</source> + <source>Leading quotes put on separate line.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="527"/> + <source>Trailing quotes put on separate line.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> <source>Blank line before class docstring removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> - <source>Blank line after class docstring removed.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="536"/> - <source>Blank line after function/method docstring removed.</source> + <source>Blank line after class docstring removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="539"/> - <source>Blank line after last paragraph removed.</source> + <source>Blank line after function/method docstring removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="542"/> - <source>Tab converted to 4 spaces.</source> + <source>Blank line after last paragraph removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="545"/> - <source>Indentation adjusted to be a multiple of four.</source> + <source>Tab converted to 4 spaces.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="548"/> - <source>Indentation of continuation line corrected.</source> + <source>Indentation adjusted to be a multiple of four.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="551"/> - <source>Indentation of closing bracket corrected.</source> + <source>Indentation of continuation line corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="554"/> - <source>Missing indentation of continuation line corrected.</source> + <source>Indentation of closing bracket corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="557"/> - <source>Closing bracket aligned to opening bracket.</source> + <source>Missing indentation of continuation line corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="560"/> - <source>Indentation level changed.</source> + <source>Closing bracket aligned to opening bracket.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="563"/> - <source>Indentation level of hanging indentation changed.</source> + <source>Indentation level changed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="566"/> + <source>Indentation level of hanging indentation changed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="569"/> <source>Visual indentation corrected.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="584"/> + <source>Extraneous whitespace removed.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="581"/> - <source>Extraneous whitespace removed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="578"/> <source>Missing whitespace added.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="584"/> - <source>Whitespace around comment sign corrected.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="587"/> + <source>Whitespace around comment sign corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="590"/> <source>One blank line inserted.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="591"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> <source>%n blank line(s) inserted.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -3744,7 +3744,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="597"/> <source>%n superfluous lines removed</source> <translation type="unfinished"> <numerusform></numerusform> @@ -3752,77 +3752,77 @@ </translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="598"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="601"/> <source>Superfluous blank lines removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="601"/> - <source>Superfluous blank lines after function decorator removed.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="604"/> - <source>Imports were put on separate lines.</source> + <source>Superfluous blank lines after function decorator removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="607"/> - <source>Long lines have been shortened.</source> + <source>Imports were put on separate lines.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="610"/> + <source>Long lines have been shortened.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="613"/> <source>Redundant backslash in brackets removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="616"/> - <source>Compound statement corrected.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="619"/> - <source>Comparison to None/True/False corrected.</source> + <source>Compound statement corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="622"/> - <source>'{0}' argument added.</source> + <source>Comparison to None/True/False corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="625"/> - <source>'{0}' argument removed.</source> + <source>'{0}' argument added.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="628"/> - <source>Whitespace stripped from end of line.</source> + <source>'{0}' argument removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="631"/> - <source>newline added to end of file.</source> + <source>Whitespace stripped from end of line.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="634"/> - <source>Superfluous trailing blank lines removed from end of file.</source> + <source>newline added to end of file.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="637"/> + <source>Superfluous trailing blank lines removed from end of file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="640"/> <source>'<>' replaced by '!='.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="641"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="644"/> <source>Could not save the file! Skipping it. Reason: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="710"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="713"/> <source> no message defined for code '{0}'</source> <translation type="unfinished"></translation> </message> @@ -7278,197 +7278,197 @@ <context> <name>DocStyleChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="260"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="263"/> <source>module is missing a docstring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="262"/> - <source>public function/method is missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="265"/> - <source>private function/method may be missing a docstring</source> + <source>public function/method is missing a docstring</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="268"/> + <source>private function/method may be missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="271"/> <source>public class is missing a docstring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="270"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="273"/> <source>private class may be missing a docstring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="272"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="275"/> <source>docstring not surrounded by """</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="274"/> - <source>docstring containing \ not surrounded by r"""</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="277"/> - <source>docstring containing unicode character not surrounded by u"""</source> + <source>docstring containing \ not surrounded by r"""</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="280"/> + <source>docstring containing unicode character not surrounded by u"""</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="283"/> <source>one-liner docstring on multiple lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="282"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="285"/> <source>docstring has wrong indentation</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="328"/> + <source>docstring summary does not end with a period</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="291"/> + <source>docstring summary is not in imperative mood (Does instead of Do)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="295"/> + <source>docstring summary looks like a function's/method's signature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="298"/> + <source>docstring does not mention the return value type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="301"/> + <source>function/method docstring is separated by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="304"/> + <source>class docstring is not preceded by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="307"/> + <source>class docstring is not followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="362"/> + <source>docstring summary is not followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="313"/> + <source>last paragraph of docstring is not followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="317"/> + <source>private function/method is missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="320"/> + <source>private class is missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="322"/> + <source>leading quotes of docstring not on separate line</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="325"/> - <source>docstring summary does not end with a period</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="288"/> - <source>docstring summary is not in imperative mood (Does instead of Do)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="292"/> - <source>docstring summary looks like a function's/method's signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="295"/> - <source>docstring does not mention the return value type</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="298"/> - <source>function/method docstring is separated by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="301"/> - <source>class docstring is not preceded by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="304"/> - <source>class docstring is not followed by a blank line</source> + <source>trailing quotes of docstring not on separate line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="332"/> + <source>docstring does not contain a @return line but function/method returns something</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="336"/> + <source>docstring contains a @return line but function/method doesn't return anything</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="340"/> + <source>docstring does not contain enough @param/@keyparam lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="343"/> + <source>docstring contains too many @param/@keyparam lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="346"/> + <source>keyword only arguments must be documented with @keyparam lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="349"/> + <source>order of @param/@keyparam lines does not match the function/method signature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="352"/> + <source>class docstring is preceded by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="354"/> + <source>class docstring is followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="356"/> + <source>function/method docstring is preceded by a blank line</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="359"/> - <source>docstring summary is not followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="310"/> - <source>last paragraph of docstring is not followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="314"/> - <source>private function/method is missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="317"/> - <source>private class is missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="319"/> - <source>leading quotes of docstring not on separate line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="322"/> - <source>trailing quotes of docstring not on separate line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="329"/> - <source>docstring does not contain a @return line but function/method returns something</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="333"/> - <source>docstring contains a @return line but function/method doesn't return anything</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="337"/> - <source>docstring does not contain enough @param/@keyparam lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="340"/> - <source>docstring contains too many @param/@keyparam lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="343"/> - <source>keyword only arguments must be documented with @keyparam lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="346"/> - <source>order of @param/@keyparam lines does not match the function/method signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="349"/> - <source>class docstring is preceded by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="351"/> - <source>class docstring is followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="353"/> - <source>function/method docstring is preceded by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="356"/> <source>function/method docstring is followed by a blank line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="362"/> - <source>last paragraph of docstring is followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="365"/> + <source>last paragraph of docstring is followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="368"/> <source>docstring does not contain a @exception line but function/method raises an exception</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="369"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="372"/> <source>docstring contains a @exception line but function/method doesn't raise an exception</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="374"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="377"/> <source>{0}: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="284"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="287"/> <source>docstring does not contain a summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="327"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="330"/> <source>docstring summary does not start with '{0}'</source> <translation type="unfinished"></translation> </message> @@ -9274,92 +9274,92 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="658"/> + <location filename="../QScintilla/Editor.py" line="661"/> <source>Undo</source> <translation>Défaire</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="661"/> - <source>Redo</source> - <translation>Refaire</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="664"/> + <source>Redo</source> + <translation>Refaire</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="667"/> <source>Revert to last saved state</source> <translation>Ecraser avec le dernier état enregistré</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="668"/> - <source>Cut</source> - <translation>Couper</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="671"/> - <source>Copy</source> - <translation>Copier</translation> + <source>Cut</source> + <translation>Couper</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="674"/> + <source>Copy</source> + <translation>Copier</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="677"/> <source>Paste</source> <translation>Coller</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="679"/> - <source>Indent</source> - <translation>Indenter</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="682"/> - <source>Unindent</source> - <translation>Désindenter</translation> + <source>Indent</source> + <translation>Indenter</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="685"/> - <source>Comment</source> - <translation>Commenter</translation> + <source>Unindent</source> + <translation>Désindenter</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="688"/> - <source>Uncomment</source> - <translation>Décommenter</translation> + <source>Comment</source> + <translation>Commenter</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="691"/> - <source>Stream Comment</source> - <translation>Commentaire type "Stream"</translation> + <source>Uncomment</source> + <translation>Décommenter</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="694"/> + <source>Stream Comment</source> + <translation>Commentaire type "Stream"</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="697"/> <source>Box Comment</source> <translation>Commentaire type "Bloc"</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="698"/> - <source>Select to brace</source> - <translation>Sélection parenthèses</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="700"/> - <source>Select all</source> - <translation>Tout sélectionner</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="701"/> + <source>Select to brace</source> + <translation>Sélection parenthèses</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="703"/> + <source>Select all</source> + <translation>Tout sélectionner</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="704"/> <source>Deselect all</source> <translation>Tout déselectionner</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="715"/> + <location filename="../QScintilla/Editor.py" line="718"/> <source>Shorten empty lines</source> <translation>Raccourcir les lignes vides</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="907"/> + <location filename="../QScintilla/Editor.py" line="910"/> <source>Languages</source> <translation>Langages</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="722"/> + <location filename="../QScintilla/Editor.py" line="725"/> <source>Use Monospaced Font</source> <translation>Utiliser une police monospacée</translation> </message> @@ -9369,422 +9369,422 @@ <translation type="obsolete">Autocomplétion activée</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="837"/> + <location filename="../QScintilla/Editor.py" line="840"/> <source>Check</source> <translation>Vérification</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="857"/> - <source>Show</source> - <translation>Afficher...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="768"/> - <source>Close</source> - <translation>Fermer</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="774"/> - <source>Save</source> - <translation>Enregistrer</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="777"/> - <source>Save As...</source> - <translation>Enregistrer sous...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="793"/> - <source>Print</source> - <translation>Imprimer</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="859"/> - <source>Code metrics...</source> - <translation>Statistiques du code...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="860"/> + <source>Show</source> + <translation>Afficher...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="771"/> + <source>Close</source> + <translation>Fermer</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="777"/> + <source>Save</source> + <translation>Enregistrer</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="780"/> + <source>Save As...</source> + <translation>Enregistrer sous...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="796"/> + <source>Print</source> + <translation>Imprimer</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="862"/> + <source>Code metrics...</source> + <translation>Statistiques du code...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="863"/> <source>Code coverage...</source> <translation>Code coverage...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="868"/> + <location filename="../QScintilla/Editor.py" line="871"/> <source>Profile data...</source> <translation>Profiler les données...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1153"/> + <location filename="../QScintilla/Editor.py" line="1156"/> <source>Toggle bookmark</source> <translation>Placer/supprimer un signet</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1155"/> + <location filename="../QScintilla/Editor.py" line="1158"/> <source>Next bookmark</source> <translation>Signet suivant</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1157"/> + <location filename="../QScintilla/Editor.py" line="1160"/> <source>Previous bookmark</source> <translation>Signet précédent</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1159"/> + <location filename="../QScintilla/Editor.py" line="1162"/> <source>Clear all bookmarks</source> <translation>Effacer tous les signets</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1179"/> + <location filename="../QScintilla/Editor.py" line="1182"/> <source>Toggle breakpoint</source> <translation>Placer/supprimer un point d'arrêt</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1184"/> + <location filename="../QScintilla/Editor.py" line="1187"/> <source>Edit breakpoint...</source> <translation>Éditer le point d'arrêt...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5154"/> + <location filename="../QScintilla/Editor.py" line="5161"/> <source>Enable breakpoint</source> <translation>Activer le point d'arrêt</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1189"/> + <location filename="../QScintilla/Editor.py" line="1192"/> <source>Next breakpoint</source> <translation>Point d'arrêt suivant</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1191"/> + <location filename="../QScintilla/Editor.py" line="1194"/> <source>Previous breakpoint</source> <translation>Point d'arrêt précédent</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1193"/> + <location filename="../QScintilla/Editor.py" line="1196"/> <source>Clear all breakpoints</source> <translation>Effacer tous les points d'arrêts</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1213"/> + <location filename="../QScintilla/Editor.py" line="1216"/> <source>LMB toggles bookmarks</source> <translation>Le click principal place des signets</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1217"/> + <location filename="../QScintilla/Editor.py" line="1220"/> <source>LMB toggles breakpoints</source> <translation>Le click principal place les points d'arrêts</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1752"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>Modification of Read Only file</source> <translation>Modification de la lecture seule</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1752"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Le fichier est en lecture seule. Sauvez d'abord votre fichier sous un autre nom.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2443"/> + <location filename="../QScintilla/Editor.py" line="2448"/> <source>Printing...</source> <translation>Impression....</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2460"/> - <source>Printing completed</source> - <translation>Impression terminée</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2462"/> - <source>Error while printing</source> - <translation>Erreur durant l'impression</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2465"/> + <source>Printing completed</source> + <translation>Impression terminée</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2467"/> + <source>Error while printing</source> + <translation>Erreur durant l'impression</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2470"/> <source>Printing aborted</source> <translation>Impression abandonnée</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2878"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source>Open File</source> <translation>Ouvrir Fichier</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3041"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source>Save File</source> <translation>Enregistrer Fichier</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2823"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source>File Modified</source> <translation>Fichier Modifié</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4427"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion</source> <translation>Autocompletion</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4427"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>L'autocompletion n'est pas disponible car aucune source d'autocomplétion n'est définie.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5157"/> + <location filename="../QScintilla/Editor.py" line="5164"/> <source>Disable breakpoint</source> <translation>Désactiver le point d'arrêt</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5531"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Code Coverage</source> <translation>Code Coverage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5531"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Please select a coverage file</source> <translation>Sélectionner un fichier coverage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5709"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Profile Data</source> <translation>Profiler de données</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5709"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Please select a profile file</source> <translation>Sélectionner un fichier profile</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6184"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Macro Name</source> <translation>Nom de la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6184"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Select a macro name:</source> <translation>Sélectionner un nom de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6255"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Macro files (*.macro)</source> <translation>Fichier Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6212"/> + <location filename="../QScintilla/Editor.py" line="6219"/> <source>Load macro file</source> <translation>Charger un fichier macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6235"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source>Error loading macro</source> <translation>Erreur lors du chargement de la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6255"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Save macro file</source> <translation>Enregistrer le fichier macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6272"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source>Save macro</source> <translation>Enregistrer la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6288"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source>Error saving macro</source> <translation>Erreur lors de l'enregistrement de la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6301"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Start Macro Recording</source> <translation>Démarrer l'enregistrement de la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6327"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Macro Recording</source> <translation>Enregistrement de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6327"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Enter name of the macro:</source> <translation>Entrer le nom de la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6465"/> + <location filename="../QScintilla/Editor.py" line="6472"/> <source>File changed</source> <translation>Fichier modifié</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="727"/> + <location filename="../QScintilla/Editor.py" line="730"/> <source>Autosave enabled</source> <translation>Sauvegarde automatique activée</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1162"/> + <location filename="../QScintilla/Editor.py" line="1165"/> <source>Goto syntax error</source> <translation>Aller à l'erreur de syntaxe suivante</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1166"/> + <location filename="../QScintilla/Editor.py" line="1169"/> <source>Clear syntax error</source> <translation>Supprimer les flags d'erreurs de syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6769"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source>Drop Error</source> <translation>Erreur de suppression</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1164"/> + <location filename="../QScintilla/Editor.py" line="1167"/> <source>Show syntax error message</source> <translation>Afficher le message d'erreur de syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5869"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>Syntax Error</source> <translation>Erreur de syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5869"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>No syntax error message available.</source> <translation>Aucun message d'erreur de syntaxe..</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1181"/> + <location filename="../QScintilla/Editor.py" line="1184"/> <source>Toggle temporary breakpoint</source> <translation>Placer/Supprimer un point d'arret temporaire</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="862"/> - <source>Show code coverage annotations</source> - <translation>Afficher les annotations de code coverage</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="865"/> + <source>Show code coverage annotations</source> + <translation>Afficher les annotations de code coverage</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="868"/> <source>Hide code coverage annotations</source> <translation>Masquer les annotations de code coverage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1196"/> - <source>Next uncovered line</source> - <translation>Ligne non executée suivante</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1199"/> + <source>Next uncovered line</source> + <translation>Ligne non executée suivante</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1202"/> <source>Previous uncovered line</source> <translation>Ligne non executée précédente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5594"/> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>Show Code Coverage Annotations</source> <translation>Afficher les annotations de Code Coverage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5587"/> - <source>All lines have been covered.</source> - <translation>Toutes les lignes ont été executées.</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="5594"/> + <source>All lines have been covered.</source> + <translation>Toutes les lignes ont été executées.</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>There is no coverage file available.</source> <translation>Impossible de trouver le fichier de coverage.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="881"/> + <location filename="../QScintilla/Editor.py" line="884"/> <source>Diagrams</source> <translation>Diagrammes</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="883"/> + <location filename="../QScintilla/Editor.py" line="886"/> <source>Class Diagram...</source> <translation>Diagramme des classes...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="885"/> + <location filename="../QScintilla/Editor.py" line="888"/> <source>Package Diagram...</source> <translation>Diagramme des packages...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="887"/> + <location filename="../QScintilla/Editor.py" line="890"/> <source>Imports Diagram...</source> <translation>Diagramme des modules...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="889"/> + <location filename="../QScintilla/Editor.py" line="892"/> <source>Application Diagram...</source> <translation>Diagramme de l'application...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="910"/> + <location filename="../QScintilla/Editor.py" line="913"/> <source>No Language</source> <translation>Pas de langage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6790"/> + <location filename="../QScintilla/Editor.py" line="6797"/> <source>Resources</source> <translation>Ressources</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6792"/> - <source>Add file...</source> - <translation>Ajouter un fichier...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6794"/> - <source>Add files...</source> - <translation>Ajouter des fichiers...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6796"/> - <source>Add aliased file...</source> - <translation>Ajouter un fichier alias...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6799"/> - <source>Add localized resource...</source> - <translation>Ajouter une ressource localisée...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6822"/> - <source>Add file resource</source> - <translation>Ajoute un fichier ressource</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6838"/> - <source>Add file resources</source> - <translation>Ajoute des fichiers ressources</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6866"/> - <source>Add aliased file resource</source> - <translation>Ajoute un alias de fichier ressource</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6930"/> - <source>Package Diagram</source> - <translation>Diagramme de package</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6930"/> - <source>Include class attributes?</source> - <translation>Inclure les attributs de classes ?</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6964"/> - <source>Application Diagram</source> - <translation>Diagramme de l'application</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6964"/> - <source>Include module names?</source> - <translation>Inclure les noms de modules ?</translation> + <source>Add file...</source> + <translation>Ajouter un fichier...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6801"/> + <source>Add files...</source> + <translation>Ajouter des fichiers...</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="6803"/> + <source>Add aliased file...</source> + <translation>Ajouter un fichier alias...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6806"/> + <source>Add localized resource...</source> + <translation>Ajouter une ressource localisée...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6829"/> + <source>Add file resource</source> + <translation>Ajoute un fichier ressource</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6845"/> + <source>Add file resources</source> + <translation>Ajoute des fichiers ressources</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6873"/> + <source>Add aliased file resource</source> + <translation>Ajoute un alias de fichier ressource</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6937"/> + <source>Package Diagram</source> + <translation>Diagramme de package</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6937"/> + <source>Include class attributes?</source> + <translation>Inclure les attributs de classes ?</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6971"/> + <source>Application Diagram</source> + <translation>Diagramme de l'application</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6971"/> + <source>Include module names?</source> + <translation>Inclure les noms de modules ?</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6810"/> <source>Add resource frame</source> <translation>Ajouter un cadre ressource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6301"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Macro recording is already active. Start new?</source> <translation>L'enregistrement de macro est déjà actif. En démarrer une nouvelle ?</translation> </message> @@ -9794,52 +9794,52 @@ <translation type="obsolete">Autocomplétion</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="819"/> + <location filename="../QScintilla/Editor.py" line="822"/> <source>Complete from Document</source> <translation type="unfinished">à partir du document</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="821"/> + <location filename="../QScintilla/Editor.py" line="824"/> <source>Complete from APIs</source> <translation type="unfinished">à partir des fichiers API</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="823"/> + <location filename="../QScintilla/Editor.py" line="826"/> <source>Complete from Document and APIs</source> <translation type="unfinished">à partir du document et des fichiers API</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1202"/> + <location filename="../QScintilla/Editor.py" line="1205"/> <source>Next task</source> <translation>Tâche suivante</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1204"/> + <location filename="../QScintilla/Editor.py" line="1207"/> <source>Previous task</source> <translation>Tâche précédente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1030"/> + <location filename="../QScintilla/Editor.py" line="1033"/> <source>Export as</source> <translation>Exporter en tant que</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1253"/> + <location filename="../QScintilla/Editor.py" line="1256"/> <source>Export source</source> <translation>Exportation de source</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1253"/> + <location filename="../QScintilla/Editor.py" line="1256"/> <source>No export format given. Aborting...</source> <translation>Aucun format d'exportation indiqué. Abandon...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6950"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Imports Diagram</source> <translation>Diagramme des modules</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6950"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Include imports from external modules?</source> <translation>Inclure l'importation de modules externes?</translation> </message> @@ -9849,332 +9849,332 @@ <translation type="obsolete">Dynamique</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="746"/> + <location filename="../QScintilla/Editor.py" line="749"/> <source>Calltip</source> <translation>Calltip</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="790"/> + <location filename="../QScintilla/Editor.py" line="793"/> <source>Print Preview</source> <translation>Aperçu avant impression</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="400"/> + <location filename="../QScintilla/Editor.py" line="403"/> <source><b>A Source Editor Window</b><p>This window is used to display and edit a source file. You can open as many of these as you like. The name of the file is displayed in the window's titlebar.</p><p>In order to set breakpoints just click in the space between the line numbers and the fold markers. Via the context menu of the margins they may be edited.</p><p>In order to set bookmarks just Shift click in the space between the line numbers and the fold markers.</p><p>These actions can be reversed via the context menu.</p><p>Ctrl clicking on a syntax error marker shows some info about this error.</p></source> <translation><b>Fenêtre d'édition</b><p>Cette fenêtre est utilisée pour afficher et éditer les codes sources. Vous pouvez en ouvrir autant que vous le souhaitez. Le nom du fichier ouvert est inscrit dans la barre principale.</p><p>Vous pouvez définir des points d'arrêt en cliquant sur la marge de gauche, entre les numéros de lignes et les marques de pliage de code. Les points d'arrêt peuvent être édités via le menu contextuel (en cliquant droit sur le point).</p><p>De manière similaire, vous pouvez définir des signets avec Shift+Click dans la marge.</p><p>Pour ces deux types de points, le menu contextuel (click droit) permet de défaire l'action.</p><p>Le Ctrl+Click sur une marque d'erreur de sytaxe permet de visualiser les informations sur l'erreur.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="731"/> + <location filename="../QScintilla/Editor.py" line="734"/> <source>Typing aids enabled</source> <translation>Aide à la frappe activée</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="994"/> + <location filename="../QScintilla/Editor.py" line="997"/> <source>End-of-Line Type</source> <translation>Type de fin de ligne</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="998"/> + <location filename="../QScintilla/Editor.py" line="1001"/> <source>Unix</source> <translation>Unix</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1005"/> + <location filename="../QScintilla/Editor.py" line="1008"/> <source>Windows</source> <translation>Windows</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1012"/> + <location filename="../QScintilla/Editor.py" line="1015"/> <source>Macintosh</source> <translation>Macintosh</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="953"/> + <location filename="../QScintilla/Editor.py" line="956"/> <source>Encodings</source> <translation>Encodings</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="933"/> + <location filename="../QScintilla/Editor.py" line="936"/> <source>Guessed</source> <translation>Suggestion</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1268"/> + <location filename="../QScintilla/Editor.py" line="1271"/> <source>Alternatives</source> <translation>Alternatives</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1284"/> + <location filename="../QScintilla/Editor.py" line="1287"/> <source>Pygments Lexer</source> <translation>Analyseur Pygments</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1284"/> + <location filename="../QScintilla/Editor.py" line="1287"/> <source>Select the Pygments lexer to apply.</source> <translation>Sélectionne l'analyseur Pygments à appliquer.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7242"/> + <location filename="../QScintilla/Editor.py" line="7249"/> <source>Check spelling...</source> <translation>Correction orthographique...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="707"/> + <location filename="../QScintilla/Editor.py" line="710"/> <source>Check spelling of selection...</source> <translation>Correction orthographique de la sélection...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7245"/> + <location filename="../QScintilla/Editor.py" line="7252"/> <source>Add to dictionary</source> <translation>Ajouter au dictionnaire</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7247"/> + <location filename="../QScintilla/Editor.py" line="7254"/> <source>Ignore All</source> <translation>Tout ignorer</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="711"/> + <location filename="../QScintilla/Editor.py" line="714"/> <source>Remove from dictionary</source> <translation>Supprimer du dictionnaire</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="340"/> + <location filename="../QScintilla/Editor.py" line="343"/> <source><p>The size of the file <b>{0}</b> is <b>{1} KB</b>. Do you really want to load it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1245"/> + <location filename="../QScintilla/Editor.py" line="1248"/> <source><p>No exporter available for the export format <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1264"/> + <location filename="../QScintilla/Editor.py" line="1267"/> <source>Alternatives ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2823"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation type="unfinished"><p>Le fichier <b>{0}</b> a des modifications non enregistrées. </p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2878"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2982"/> + <location filename="../QScintilla/Editor.py" line="2987"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6226"/> + <location filename="../QScintilla/Editor.py" line="6233"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6235"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6288"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6629"/> + <location filename="../QScintilla/Editor.py" line="6636"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6769"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6866"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1169"/> - <source>Next warning</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1172"/> + <source>Next warning</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1175"/> <source>Previous warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1174"/> + <location filename="../QScintilla/Editor.py" line="1177"/> <source>Show warning message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1176"/> + <location filename="../QScintilla/Editor.py" line="1179"/> <source>Clear warnings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3041"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>Le fichier <b>{0}</b>existe déjà. Écraser ?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6272"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6123"/> - <source>Warning: {0}</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6130"/> + <source>Warning: {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6137"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6461"/> + <location filename="../QScintilla/Editor.py" line="6468"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4532"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Activating Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4532"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4852"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Activating Calltip Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4852"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="786"/> + <location filename="../QScintilla/Editor.py" line="789"/> <source>Open 'rejection' file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="893"/> + <location filename="../QScintilla/Editor.py" line="896"/> <source>Load Diagram...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1207"/> - <source>Next change</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1210"/> + <source>Next change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1213"/> <source>Previous change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7659"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7659"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6059"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>Warning</source> <translation type="unfinished">Warning</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6059"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6120"/> + <location filename="../QScintilla/Editor.py" line="6127"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="760"/> - <source>New Document View</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="763"/> + <source>New Document View</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="766"/> <source>New Document View (with new split)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="847"/> + <location filename="../QScintilla/Editor.py" line="850"/> <source>Tools</source> <translation type="unfinished">Outils</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="975"/> + <location filename="../QScintilla/Editor.py" line="978"/> <source>Re-Open With Encoding</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6455"/> + <location filename="../QScintilla/Editor.py" line="6462"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="738"/> + <location filename="../QScintilla/Editor.py" line="741"/> <source>Automatic Completion enabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="816"/> + <location filename="../QScintilla/Editor.py" line="819"/> <source>Complete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4581"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4581"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7746"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7746"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="780"/> + <location filename="../QScintilla/Editor.py" line="783"/> <source>Save Copy...</source> <translation type="unfinished"></translation> </message> @@ -10257,7 +10257,7 @@ <translation>Cliquer pour sélectionner un fichier API à partir des fichiers installés</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> <source>Add from installed APIs</source> <translation>Ajouter à partir des APIs installés</translation> </message> @@ -10267,17 +10267,17 @@ <translation>Cliquer pour compiler les APIs sélectionnés</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="299"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="301"/> <source>Compile APIs</source> <translation>Compiler les APIs</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="238"/> <source>Select from the list of installed API files</source> <translation>Sélectionner parmi la liste des APIs installés</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="314"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="316"/> <source>Cancel compilation</source> <translation>Annuler la compilation</translation> </message> @@ -10292,17 +10292,17 @@ <translation>Cliquer pour sélectionner un fichier API à partir de la liste des APIs installés pour les plugins</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> <source>Add from Plugin APIs</source> <translation>Ajouter à partir des APIs de plugins</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> <source>Select from the list of API files installed by plugins</source> <translation>Sélection à partir de la liste des APIs installés par les plugins</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> <source>There are no APIs installed yet. Selection is not available.</source> <translation type="unfinished"></translation> </message> @@ -10474,6 +10474,89 @@ </message> </context> <context> + <name>EditorButtonsWidget</name> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="175"/> + <source>Bold</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="177"/> + <source>Italic</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="179"/> + <source>Strike Through</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="182"/> + <source>Header 1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="184"/> + <source>Header 2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="186"/> + <source>Header 3</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="188"/> + <source>Header</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="193"/> + <source>Inline Code</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="195"/> + <source>Code Block</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="197"/> + <source>Quote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="200"/> + <source>Add Hyperlink</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="202"/> + <source>Add Horizontal Line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="204"/> + <source>Add Image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="207"/> + <source>Add Bulleted List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="209"/> + <source>Add Numbered List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="273"/> + <source>Level {0}</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>EditorCalltipsPage</name> <message> <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="37"/> @@ -11293,7 +11376,7 @@ <translation>Sélectionne un analyseur syntaxique alternatif</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightersPage.py" line="142"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightersPage.py" line="146"/> <source>Alternative</source> <translation>Alternatif</translation> </message> @@ -11321,7 +11404,7 @@ <translation>Cocher pour appliquer le style jusqu'en fin de ligne.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> <source>Fill to end of line</source> <translation>Appliquer jusqu'à la fin de ligne</translation> </message> @@ -11396,17 +11479,17 @@ <translation>Tout appliquer jusqu'aux fins de lignes</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="351"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="355"/> <source>Enabled</source> <translation>Activé</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="352"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="356"/> <source>Disabled</source> <translation>Désactivé</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> <source>Select fill to end of line for all styles</source> <translation>Sélectionner pour appliquer tous les styles jusqu'en fin de lignes</translation> </message> @@ -11466,27 +11549,27 @@ <translation>Exporter tous les styles</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465"/> <source>Export Highlighting Styles</source> <translation>Exportation des styles</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="497"/> <source>Import Highlighting Styles</source> <translation>Importation des styles</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="477"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="481"/> <source>Highlighting styles file (*.e4h)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465"/> <source><p>The highlighting styles could not be exported to file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="497"/> <source><p>The highlighting styles could not be read from file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -11613,12 +11696,12 @@ <translation>Configuration de l'analyse Bash</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1048"/> <source>Select whether folding of comments shall be possible</source> <translation>Indique si les commentaires sur plusieurs lignes doivent être contractés</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1051"/> <source>Fold comments</source> <translation>Contraction des commentaires</translation> </message> @@ -11648,22 +11731,22 @@ <translation>Indentation parenthèse ouvrante</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="990"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/> <source>Select whether folding at else statement should be possible</source> <translation>Indique si les instructions "else" doivent être contractées</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/> <source>Fold at else</source> <translation>Contraction des "else"</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="522"/> <source>Select whether folding of preprocessor directives shall be possible</source> <translation>Indique si les instructions de préprocessing doivent être contractées</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="525"/> <source>Fold preprocessor directives</source> <translation>Contraction des instructions de préprocessing</translation> </message> @@ -11708,127 +11791,127 @@ <translation>Balises tiennent compte de la casse</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="516"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/> <source>Perl Lexer Properties</source> <translation>Configuration pour Perl</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="637"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/> <source>Povray Lexer Properties</source> <translation>Configuration de Povray</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="643"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/> <source>Select whether folding of directives shall be possible</source> <translation>Cocher si le pliage de code doit être activé quand c'est possible</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="646"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/> <source>Fold directives</source> <translation>Contraction de code pour les directives</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="685"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> <source>Python Lexer Properties</source> <translation>Configuration pour Python</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="796"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="825"/> <source>Select whether bad indentation shall be highlighted</source> <translation>Sélectionner si les indentations incorrectes doivent être signalées</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="721"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="750"/> <source>Select whether text should be autoindented after a ':'</source> <translation>Indique si le texte doit être automatiquement indenté après ":"</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="724"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="753"/> <source>Auto indentation after ':'</source> <translation>Auto-indentation après ':'</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="730"/> <source>Select whether folding of strings shall be possible</source> <translation>Indique si les chaines de caractères sur plusieurs lignes doivent être contractées</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="733"/> <source>Fold strings</source> <translation>Contraction des chaines de caractères</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="827"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/> <source>SQL Lexer Properties</source> <translation>Configuration du SQL</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="863"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="892"/> <source>Select to enable Backslash Escapes</source> <translation>Cocher pour activer l'échappement avec Backslash</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="866"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="895"/> <source>Backslash Escapes</source> <translation>Echappement avec Backslash</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="964"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/> <source>VHDL Lexer Properties</source> <translation>Configuration pour VHLD</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="999"/> <source>Select whether folding of blocks at a parenthesis shall be possible</source> <translation>Cocher pour plier le code entre des parenthèses quand c'est possible</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1002"/> <source>Fold at parenthesis</source> <translation>Contraction du code entre les parenthèses</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1009"/> <source>Select whether folding of begin blocks shall be possible</source> <translation>Cocher pour plier le code entre les blocs begin quand c'est possible</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1012"/> <source>Fold at begin</source> <translation>Contraction du code entre les "begin"</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/> <source>Pascal Lexer Properties</source> <translation>Configuration pour Pascal</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="565"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="594"/> <source>PostScript Lexer Properties</source> <translation>Configuration pour PostScript</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="581"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="610"/> <source>Select to mark tokens</source> <translation>Cocher pour marquer les opérateurs 'tokens'</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="584"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="613"/> <source>Mark Tokens</source> <translation>Marquer les 'tokens'</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="593"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="622"/> <source>PostScript Level:</source> <translation>Niveau de PostScript:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="600"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="629"/> <source>Select the PostScript level</source> <translation>Sélectionne les niveau de PostScript</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1013"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1042"/> <source>YAML Lexer Properties</source> <translation>Configuration de YAML</translation> </message> @@ -11878,62 +11961,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="503"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/> <source>Select to enable smart highlighting of keywords</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/> - <source>Smart Highlighting</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/> - <source>Select to enable folding of Perl packages</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="535"/> + <source>Smart Highlighting</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="561"/> + <source>Select to enable folding of Perl packages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="564"/> <source>Fold packages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="542"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="571"/> <source>Select to enable folding of Perl POD blocks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="574"/> <source>Fold POD blocks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="741"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="770"/> <source>Select to allow Python v2 unicode string literals (e.g. u"utf8")</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="744"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="773"/> <source>Allow v2 unicode string literals</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="751"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="780"/> <source>Select to allow Python v3 binary and octal literals (e.g. 0b1011, 0o712)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="754"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/> <source>Allow v3 binary and octal literals</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="761"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="790"/> <source>Select to allow Python v3 bytes string literals (e.g. b"bytes")</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="764"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="793"/> <source>Allow v3 bytes string literals</source> <translation type="unfinished"></translation> </message> @@ -11968,112 +12051,112 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="695"/> <source>Properties Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/> <source>Select to allow initial spaces in a line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/> <source>Allow initial spaces</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="740"/> <source>Select whether folding of triple quoted strings shall be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="743"/> <source>Fold triple quoted strings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="760"/> <source>Select to allow strings to span newline characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="734"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="763"/> <source>Strings may span newline characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="808"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="837"/> <source>Ruby Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="853"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="882"/> <source>Select whether only BEGIN blocks can be folded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="885"/> <source>Only BEGIN blocks can be folded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="873"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="902"/> <source>Select if words may contain dots</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="876"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="905"/> <source>Words may contain dots</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="883"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="912"/> <source>Select to allow '#' as a comment character</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="886"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="915"/> <source>Allow '#' as comment character</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="893"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="922"/> <source>Select to enable quoted identifiers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="896"/> - <source>Enable quoted identifiers</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="906"/> - <source>TCL Lexer Properties</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="925"/> - <source>TeX Lexer Properties</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="941"/> - <source>Select to treat comments as TeX source</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="944"/> - <source>Treat comments as TeX source</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="951"/> - <source>Select to treat \if<unknown> as a command</source> + <source>Enable quoted identifiers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="935"/> + <source>TCL Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="954"/> + <source>TeX Lexer Properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/> + <source>Select to treat comments as TeX source</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/> + <source>Treat comments as TeX source</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/> + <source>Select to treat \if<unknown> as a command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/> <source>Treat \if<unknown> as command</source> <translation type="unfinished"></translation> </message> @@ -12083,7 +12166,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="774"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="803"/> <source>Highlight sub-identifiers</source> <translation type="unfinished"></translation> </message> @@ -12093,7 +12176,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="771"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="800"/> <source>Select to highlight sub-identifiers defined in keyword set 2</source> <translation type="unfinished"></translation> </message> @@ -12148,32 +12231,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="812"/> <source>Highlight bad indentation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>No Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Inconsistent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Tabs after Spaces</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Spaces</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Tabs</source> <translation type="unfinished"></translation> </message> @@ -12193,7 +12276,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="194"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/> <source>Highlight escape sequences</source> <translation type="unfinished"></translation> </message> @@ -12207,6 +12290,26 @@ <source>Allow verbatim string escape sequences</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/> + <source>JSON</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="483"/> + <source>Select to enable highlighting of line/block comments</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="486"/> + <source>Highlight comments</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/> + <source>Select to enable highlighting of escape sequences in strings</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSearchPage</name> @@ -13352,6 +13455,16 @@ <source>Select the colour for the search marker</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1866"/> + <source>Select to hide the Format Buttons bar when formatting is not supported</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1869"/> + <source>Hide Format Buttons bar when not supported</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSyntaxPage</name> @@ -13620,22 +13733,22 @@ <context> <name>EmailDialog</name> <message> - <location filename="../UI/EmailDialog.py" line="339"/> + <location filename="../UI/EmailDialog.py" line="346"/> <source>Send bug report</source> <translation>Envoyer un rapport de bug</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="357"/> + <location filename="../UI/EmailDialog.py" line="364"/> <source>Attach file</source> <translation>Pièce jointe</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="293"/> + <location filename="../UI/EmailDialog.py" line="300"/> <source>Mail Server Password</source> <translation>Mot de masse du serveur mail</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="293"/> + <location filename="../UI/EmailDialog.py" line="300"/> <source>Enter your mail server password</source> <translation>Entrer votre mot de passe pour le serveur mail</translation> </message> @@ -13730,12 +13843,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="311"/> + <location filename="../UI/EmailDialog.py" line="318"/> <source><p>Authentication failed.<br>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="339"/> + <location filename="../UI/EmailDialog.py" line="346"/> <source><p>Message could not be sent.<br>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -13743,17 +13856,17 @@ <context> <name>EmailPage</name> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="183"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="225"/> <source>Enter your password for accessing the mail server</source> <translation>Entrer votre mot de passe pour accéder au serveur mail</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="211"/> <source>Enter your mail server username</source> <translation>Entrer votre nom d'utilisateur pour le serveur mail</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="106"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="170"/> <source>Signature:</source> <translation>Signature:</translation> </message> @@ -13763,37 +13876,37 @@ <translation>Entrer l'adresse de votre serveur mail</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="92"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/> <source>Email address:</source> <translation>Adresse Email:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="116"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="180"/> <source>Enter your email signature</source> <translation>Entrer votre signature mail</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="99"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/> <source>Enter your email address</source> <translation>Entrer votre adresse mail</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="138"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="192"/> <source>Select to authenticatate against the mail server</source> <translation>Sélectionner pour s'identifier auprès du serveur mail</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="141"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="195"/> <source>Mail server needs authentication</source> <translation>Le serveur mail a besoin d'une identification</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="153"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="204"/> <source>Username:</source> <translation>Nom d'utilisateur:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="173"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="218"/> <source>Password:</source> <translation>Mot de passe:</translation> </message> @@ -13803,17 +13916,17 @@ <translation><b>Configuration de l'email</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="128"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="104"/> <source>Select to use TLS</source> <translation>Cocher pour utiliser une connexion sécurisée TLS</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="131"/> <source>Use TLS</source> - <translation>Connexion TLS</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="60"/> + <translation type="obsolete">Connexion TLS</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="124"/> <source>Enter the port of the mail server</source> <translation>Entrer le port du serveur mail</translation> </message> @@ -13823,35 +13936,65 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/> - <source>Outgoing mail server port:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="193"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="235"/> <source>Press to test the login data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="196"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="238"/> <source>Test Login</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/> <source>Login Test</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="138"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="204"/> <source>The login test succeeded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/> <source><p>The login test failed.<br>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/> + <source>Encryption Method:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="81"/> + <source>Select to use no encryption</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="84"/> + <source>None</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="94"/> + <source>Select to use SSL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="97"/> + <source>SSL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="107"/> + <source>TLS</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="117"/> + <source>Port:</source> + <translation type="unfinished">Port:</translation> + </message> </context> <context> <name>EricAccessHandler</name> @@ -14793,7 +14936,7 @@ <context> <name>ExceptionsFilterDialog</name> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="16"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="17"/> <source><b>Exception Filter</b> <p>This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the "Start Debugging" dialog is unchecked, no exception will be reported at all.</p> <p>Please note, that unhandled exceptions are always highlighted independent of these settings.</p></source> @@ -14802,47 +14945,47 @@ <p>Noter que les exceptions inexpliquées seront toujours signalées indépendamment de ces réglages.</p></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="69"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="64"/> <source>Delete</source> <translation>Supprimer</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="52"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="51"/> <source>Enter an exception type that shall be highlighted</source> <translation>Entrer un type d'exception à surligner</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="27"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="28"/> <source>List of exceptions that shall be highlighted</source> <translation>Liste des exceptions qui doivent être surlignées</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="42"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="41"/> <source>Press to add the entered exception to the list</source> <translation>Cliquer pour ajouter l'exception à la liste</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="45"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="44"/> <source>Add</source> <translation>Ajouter</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="66"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="61"/> <source>Press to delete the selected exception from the list</source> <translation>Cliquer pour supprimer l'exception sélectionnée de la liste</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="13"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="14"/> <source>Exceptions Filter</source> <translation>Filtre d'exceptions</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="76"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="71"/> <source>Press to delete all exceptions from the list</source> <translation>Cliquer pour supprimer toutes les exceptions de la liste</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="79"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="74"/> <source>Delete All</source> <translation>Tous supprimer</translation> </message> @@ -21915,7 +22058,7 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1822"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -21965,147 +22108,147 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012"/> <source>Reverting changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1057"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1359"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2022"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2427"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2451"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2604"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2730"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2727"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2625"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2475"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2759"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2710"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2623"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2578"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -22115,72 +22258,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2959"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -22195,157 +22338,157 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Revert changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1030"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="997"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1133"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3614"/> <source>Mercurial Bookmark</source> <translation type="unfinished">Signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> <source>Delete Bookmark</source> <translation type="unfinished">Supprimer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished">Selectionner le signet à supprimer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Supprimer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Renommer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Déplacer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Pull Bookmark</source> <translation type="unfinished">Récuperer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished">Sélectionner le signet à récuperer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished">Récupérant le signet d'un dépôt Mercurial distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Push Bookmark</source> <translation type="unfinished">Envoyer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Select the bookmark to be push:</source> <translation type="unfinished">Sélectionner le signet à envoyer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3924"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished">À envoyer le signet à un dépôt Mercurial distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -24672,7 +24815,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> @@ -24702,17 +24845,17 @@ <translation type="unfinished">Sélectionner le champ à filtrer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/> <source>Revision</source> <translation type="unfinished">Révision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> <source>Author</source> <translation type="unfinished">Auteur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="103"/> <source>Message</source> <translation type="unfinished">Message</translation> </message> @@ -24737,142 +24880,142 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="285"/> <source>Action</source> <translation type="unfinished">Action</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="290"/> <source>Path</source> <translation type="unfinished">Chemin</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="295"/> <source>Copy from</source> <translation type="unfinished">Copie depuis</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="306"/> <source>Press to get the next bunch of log entries</source> <translation type="unfinished">Cliquer pour obtenir les messages log suivants</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="309"/> <source>&Next</source> <translation type="unfinished">&Suivant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="316"/> <source>Enter the limit of entries to fetch</source> <translation type="unfinished">Entrer le nombre de messages max à rechercher</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="335"/> <source>Select to stop listing log messages at a copy or move</source> <translation type="unfinished">Cocher pour arrêter le listing des messages de log lors d'une copie ou d'un déplacement</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="338"/> <source>Stop on Copy/Move</source> <translation type="unfinished">Arrêt lors de copie/déplacement</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="398"/> <source>Press to compare two revisions</source> <translation type="unfinished">Cliquer pour comparer deux versions</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="401"/> <source>&Compare Revisions</source> <translation type="unfinished">&Comparer des versions</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="462"/> <source>Errors</source> <translation type="unfinished">Erreurs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="468"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="484"/> <source>Input</source> <translation type="unfinished">Entrée</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="474"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="506"/> <source>Press to send the input to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="477"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="509"/> <source>&Send</source> <translation type="unfinished">&Envoyer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="512"/> <source>Alt+S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="519"/> <source>Enter data to be sent to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="526"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="529"/> <source>&Password Mode</source> <translation type="unfinished">Mode Mot de &Passe</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="532"/> <source>Alt+P</source> <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> <source>Added</source> <translation type="unfinished">Ajouté</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169"/> <source>Deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source>Modified</source> <translation type="unfinished">Modifié</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="993"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="993"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="666"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="747"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="669"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="750"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="753"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -24882,22 +25025,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="378"/> <source>Press to generate a diff to the first parent revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="381"/> <source>Diff to Parent &1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> <source>Press to generate a diff to the second parent revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="391"/> <source>Diff to Parent &2</source> <translation type="unfinished"></translation> </message> @@ -24912,32 +25055,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="147"/> <source>All</source> <translation type="unfinished">Tous</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="77"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> <source>Bookmarks</source> <translation type="unfinished">Signets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="90"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> @@ -24947,83 +25090,83 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="227"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1899"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2091"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="444"/> <source>Select to show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="421"/> <source>Select action from menu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> - <source>Tag</source> - <translation type="unfinished">Tag</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="204"/> - <source>Tag the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1773"/> - <source>Switch</source> - <translation type="unfinished">Basculer de version</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="209"/> - <source>Switch the working directory to the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/> + <source>Tag</source> + <translation type="unfinished">Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="235"/> + <source>Tag the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1951"/> + <source>Switch</source> + <translation type="unfinished">Basculer de version</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="240"/> + <source>Switch the working directory to the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="265"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="983"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1087"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -25048,343 +25191,227 @@ <translation type="unfinished">Cliquer pour rechercher l'occurence suivante</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Find</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> - <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Étiquettes</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Signets</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2192"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2192"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/> <source>File</source> <translation type="unfinished">Fichier</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174"/> <source>Draft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> <source>Public</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/> <source>Secret</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2049"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="261"/> <source>Pull changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="274"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1852"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2030"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2091"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> <source>Fetch changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="291"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="245"/> <source>Define Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="248"/> <source>Bookmark the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250"/> <source>Move Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253"/> <source>Move bookmark to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1972"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1972"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1816"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1994"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1816"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1994"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1937"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr><tr><td><b>Children</b></td><td>{5}</td></tr>{6}</table></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="368"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> + <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="14"/> - <source>Mercurial Log</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="26"/> <source>Log</source> - <translation type="unfinished">Log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="32"/> - <source><b>Mercurial Log</b><p>This shows the output of the hg log command. By clicking on the links you may show the difference between revisions.</p></source> - <translation type="unfinished"></translation> + <translation type="obsolete">Log</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="61"/> <source>Errors</source> - <translation type="unfinished">Erreurs</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="67"/> - <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> - <translation type="unfinished"></translation> + <translation type="obsolete">Erreurs</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="83"/> <source>Input</source> - <translation type="unfinished">Entrée</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="105"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Entrée</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="108"/> <source>&Send</source> - <translation type="unfinished">&Envoyer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="111"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="118"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Envoyer</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="125"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> + <translation type="obsolete">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="128"/> <source>&Password Mode</source> - <translation type="unfinished">Mode Mot de &Passe</translation> + <translation type="obsolete">Mode Mot de &Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="131"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="64"/> <source><b>Processing your request, please wait...</b></source> - <translation type="unfinished"><b>Votre requête est en cours d'execution, merci de patienter...</b></translation> + <translation type="obsolete"><b>Votre requête est en cours d'execution, merci de patienter...</b></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="74"/> <source>Revision</source> - <translation type="unfinished">Révision</translation> + <translation type="obsolete">Révision</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> <source>Process Generation Error</source> - <translation type="unfinished">Erreur du processus</translation> + <translation type="obsolete">Erreur du processus</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/> - <source>No log available for '{0}'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="344"/> - <source>diff to {0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="358"/> - <source>Tags: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="364"/> - <source>Parents: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="367"/> - <source><i>Author: {0}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="371"/> - <source><i>Date: {0}, {1}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="387"/> - <source>Added {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="393"/> - <source>Modified {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="399"/> - <source>Deleted {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="270"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> - <source>Could not start the hg executable.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="276"/> - <source>Mercurial Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="382"/> - <source>Added {0} (copied from {1})<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="361"/> - <source>Bookmarks: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="352"/> - <source>Phase: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="45"/> - <source>Select to show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="48"/> - <source>Show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="355"/> - <source>Branch: {0}<br /> -</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> </context> <context> @@ -25764,87 +25791,87 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="605"/> <source>Version Control</source> <translation type="unfinished">Contrôle de version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="617"/> <source>Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> <source>Add to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628"/> <source>Remove from repository (and disk)</source> <translation type="unfinished">Supprimer du référentiel (et du disque)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="548"/> <source>Show log</source> - <translation type="unfinished">Afficher le log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="552"/> + <translation type="obsolete">Afficher le log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="544"/> <source>Show log browser</source> <translation type="unfinished">Afficher le navigateur de logs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> <source>Show status</source> <translation type="unfinished">Afficher l'état (status)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="343"/> <source>Show annotated file</source> <translation type="unfinished">Afficher les fichiers annotés</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Revert changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="663"/> <source>Select all local file entries</source> <translation type="unfinished">Sélectionner tous les fichiers locaux</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="665"/> <source>Select all versioned file entries</source> <translation type="unfinished">Sélectionner tous les fichiers ayant une version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> <source>Select all local directory entries</source> <translation type="unfinished">Sélectionner tous les répertoires locaux</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="669"/> <source>Select all versioned directory entries</source> <translation type="unfinished">Sélectionner tous les répertoires ayant une version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Remove from repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Do you really want to remove these files from the repository?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="539"/> <source>Copy</source> <translation type="unfinished">Copier</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="541"/> <source>Move</source> <translation type="unfinished"></translation> </message> @@ -25854,42 +25881,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="639"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="329"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="651"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="643"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="338"/> <source>Show differences side-by-side (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="653"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="656"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="672"/> <source>Configure...</source> <translation type="unfinished">Configuration...</translation> </message> @@ -26038,581 +26065,566 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> - <source>Show log</source> - <translation type="unfinished">Afficher le log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> - <source>Show &log</source> - <translation type="unfinished">Afficher le &log</translation> + <source>Show log browser</source> + <translation type="unfinished">Afficher le navigateur de logs</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> - <source>Show the log of the local project</source> - <translation type="unfinished">Affiche le log du projet local</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation type="unfinished">Affiche une fenêtre permettant de parcourir les logs du projet local</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation type="unfinished"><b>Afficher le log</b><p>Affiche le log du projet local</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> - <source>Show log browser</source> - <translation type="unfinished">Afficher le navigateur de logs</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> - <source>Show a dialog to browse the log of the local project</source> - <translation type="unfinished">Affiche une fenêtre permettant de parcourir les logs du projet local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> + <translation type="obsolete"><b>Afficher le log</b><p>Affiche le log du projet local</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"><b>Navigateur de logs</b><p>Affiche une fenêtre permettant de parcourir les messages logs du projet local. La fenêtre n'affiche qu'un nombre limité d'entrées, mais un bouton permet d'afficher les logs plus anciens.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show &difference</source> <translation type="unfinished">Afficher les &différences</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished">Affiche les différences entre le projet local et le référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished">Affiche les différences entre le référentiel et les différentes révisions du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> <source>Show status</source> <translation type="unfinished">Afficher l'état (status)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> <source>Show the status of the local project</source> <translation type="unfinished">Affiche l'état du projet local par rapport au référentiel VCS</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation type="unfinished"><b>Afficher l'état VCS</b><p>Affiche l'état du projet local par rapport au référentiel VCS.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> <source>Show heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Show the heads of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357"/> <source>Show parents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Show the parents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="371"/> <source>Show tip</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <source>Show the tip of the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> + <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <source>Revert changes</source> + <translation type="unfinished">Revenir avant les modifications</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <source>Re&vert changes</source> + <translation type="unfinished">&Recharger le projet</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> - <source>Show the tip of the repository</source> - <translation type="unfinished"></translation> + <source>Revert all changes made to the local project</source> + <translation type="unfinished">Recharger le projet et écraser toutes les modifications locales</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> - <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> - <translation type="unfinished"></translation> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation type="unfinished"><b>Recharger le projet</b><p>Recharge le projet et écrase toutes les modifications effectuées localement.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> - <source>Revert changes</source> - <translation type="unfinished">Revenir avant les modifications</translation> + <source>Merge</source> + <translation type="unfinished">Fusionner</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> - <source>Re&vert changes</source> - <translation type="unfinished">&Recharger le projet</translation> + <source>Mer&ge changes...</source> + <translation type="unfinished">&Fusionner les modifications...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> - <source>Revert all changes made to the local project</source> - <translation type="unfinished">Recharger le projet et écraser toutes les modifications locales</translation> + <source>Merge changes of a revision into the local project</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation type="unfinished"><b>Recharger le projet</b><p>Recharge le projet et écrase toutes les modifications effectuées localement.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> - <source>Merge</source> - <translation type="unfinished">Fusionner</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> - <source>Mer&ge changes...</source> - <translation type="unfinished">&Fusionner les modifications...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> - <source>Merge changes of a revision into the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>Tag in repository</source> <translation type="unfinished">Etiqueter au niveau du référentiel (tag)</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <source>&Tag in repository...</source> + <translation type="unfinished">&Etiqueter dans le référentiel...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <source>Tag the local project in the repository</source> + <translation type="unfinished">Etiquette le projet local dans le référentiel</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"><b>Etiqueter dans le référentiel</b><p>Etiquette le projet local dans le référentiel (opération "tag").</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> - <source>&Tag in repository...</source> - <translation type="unfinished">&Etiqueter dans le référentiel...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> - <source>Tag the local project in the repository</source> - <translation type="unfinished">Etiquette le projet local dans le référentiel</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished"><b>Etiqueter dans le référentiel</b><p>Etiquette le projet local dans le référentiel (opération "tag").</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags</source> <translation type="unfinished">Lister les étiquettes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>List tags...</source> <translation type="unfinished">Lister les étiquettes...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> <source>List tags of the project</source> <translation type="unfinished">Liste les étiquettes du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"><b>Liste des étiquettes</b><p>Liste les étiquettes du projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>List branches</source> <translation type="unfinished">Lister les branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>List branches...</source> <translation type="unfinished">Lister les branches...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> + <source>List branches of the project</source> + <translation type="unfinished">Liste les branches du projet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation type="unfinished"><b>Liste des branches</b><p>Effectue la liste de toutes les branches de développement du projet.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create &branch...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> - <source>List branches of the project</source> - <translation type="unfinished">Liste les branches du projet</translation> + <source>Create a new branch for the local project in the repository</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation type="unfinished"><b>Liste des branches</b><p>Effectue la liste de toutes les branches de développement du projet.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Create branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Create &branch...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> - <source>Create a new branch for the local project in the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> <source>Close branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> <source>Close the current branch of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>Switch</source> <translation type="unfinished">Basculer de version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>S&witch...</source> <translation type="unfinished">&Basculer de version...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <source>Switch the working directory to another revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Cleanup</source> + <translation type="unfinished">Nettoyer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Cleanu&p</source> + <translation type="unfinished">&Nettoyer</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Switch the working directory to another revision</source> - <translation type="unfinished"></translation> + <source>Cleanup the local project</source> + <translation type="unfinished">Nettoyer le projet local</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> - <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source>Cleanup</source> - <translation type="unfinished">Nettoyer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source>Cleanu&p</source> - <translation type="unfinished">&Nettoyer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> - <source>Cleanup the local project</source> - <translation type="unfinished">Nettoyer le projet local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation type="unfinished"><b>Nettoyer</b><p>Permet de nettoyer le projet local.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <source>Execute command</source> + <translation type="unfinished">Exécuter une commande</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <source>E&xecute command...</source> + <translation type="unfinished">E&xécuter une commande...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <source>Execute an arbitrary Mercurial command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>Execute command</source> - <translation type="unfinished">Exécuter une commande</translation> + <source>Configure</source> + <translation type="unfinished">Configuration</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>E&xecute command...</source> - <translation type="unfinished">E&xécuter une commande...</translation> + <source>Configure...</source> + <translation type="unfinished">Configuration...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> - <source>Execute an arbitrary Mercurial command</source> + <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Configure</source> - <translation type="unfinished">Configuration</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Configure...</source> - <translation type="unfinished">Configuration...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> - <source>Show the configuration dialog with the Mercurial page selected</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> - <source>Create a .hgignore file with default values</source> + <source>Create changegroup file collecting changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1793"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> + <source>Apply changegroups...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> - <source>Create changegroup...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> - <source>Create changegroup file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1810"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> - <source>Apply changegroups...</source> + <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> + <source>Show current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Show the current branch of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> - <source>Apply one or several changegroup files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1324"/> - <source>Changegroup Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> - <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> + <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> - <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> - <source>Show current branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> - <source>Show the current branch of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source>Mark as "good"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <source>Skip</source> <translation type="unfinished">Passer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> <source>Reset</source> <translation type="unfinished">Réinitialiser</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> @@ -26632,687 +26644,687 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1300"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1627"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1610"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <source>Show an editor to edit the repository configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Edit repository configuration</source> + <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Edit repository configuration...</source> + <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> - <source>Show an editor to edit the repository configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1849"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1316"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1869"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Export Patches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <source>Export revisions to patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> - <source>Export Patches</source> + <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> - <source>Export Patches...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1889"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> - <source>Change the phase of revisions</source> + <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> - <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1906"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1393"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/> - <source>Copy Changesets (Continue)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <source>Add</source> + <translation type="unfinished">Ajouter</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <source>Add...</source> + <translation type="unfinished">Ajouter...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <source>Add a sub-repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Add</source> - <translation type="unfinished">Ajouter</translation> + <source>Remove</source> + <translation type="unfinished">Supprimer</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Add...</source> - <translation type="unfinished">Ajouter...</translation> + <source>Remove...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> - <source>Add a sub-repository</source> + <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> - <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> - <source>Remove</source> - <translation type="unfinished">Supprimer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> - <source>Remove...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> - <source>Remove sub-repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> + <source>Show &status...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <source>Show Summary</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> - <source>Show &status...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> - <source>Show Summary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show summary...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> <source>Show summary information of the working directory status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> + <source>Cancel uncommitted merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> + <source>Cancel an uncommitted merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> + <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <source>List bookmarks</source> + <translation type="unfinished">Lister les signets</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <source>List bookmarks...</source> + <translation type="unfinished">Lister les signets ...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <source>List bookmarks of the project</source> + <translation type="unfinished">Lister les signets du projet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation type="unfinished"><b>Lister les signets</b><p>Ceci liste tous les signets du projet.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> + <source>Define bookmark</source> + <translation type="unfinished">Définir signet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> + <source>Define bookmark...</source> + <translation type="unfinished">Définir signet ...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> + <source>Define a bookmark for the project</source> + <translation type="unfinished">Définir un signet pour le projet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <translation type="unfinished"><b>Définir un signet</b><p>Ceci défini un signet pour le projet.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> + <source>Delete bookmark</source> + <translation type="unfinished">Supprimer signet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> + <source>Delete bookmark...</source> + <translation type="unfinished">Supprimer signet ...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> + <source>Delete a bookmark of the project</source> + <translation type="unfinished">Supprimer un signet du projet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation type="unfinished"><b>Supprimer signet</b><p>Ceci supprime un signet du projet.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> + <source>Rename bookmark</source> + <translation type="unfinished">Renommer signet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> + <source>Rename bookmark...</source> + <translation type="unfinished">Renommer signet ...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> + <source>Rename a bookmark of the project</source> + <translation type="unfinished">Renommer un signet du projet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation type="unfinished"><b>Renommer signet</b><p>Ceci renome un signet du projet.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> + <source>Move bookmark</source> + <translation type="unfinished">Déplacer signet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> + <source>Move bookmark...</source> + <translation type="unfinished">Déplacer signet ...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> + <source>Move a bookmark of the project</source> + <translation type="unfinished">Déplacer un signet du projet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> + <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> + <translation type="unfinished"><b>Déplacer signet</b><p>Ceci déplace un signet du projet dans un autre ensemble.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> + <source>Show incoming bookmarks</source> + <translation type="unfinished">Montrer nouveaux signets</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> + <source>Show a list of incoming bookmarks</source> + <translation type="unfinished">Montrer la liste des nouveaux signets</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/> + <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> + <translation type="unfinished"><b>Montrer les nouveaux signets</b><p>Cedi montre la liste des nouveaux signets disponibles dans le dépôt distant. </p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> + <source>Pull bookmark</source> + <translation type="unfinished">Télécharger signet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> + <source>Pull a bookmark from a remote repository</source> + <translation type="unfinished">Télecharger un sginet d'un répertoire distant</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> + <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> + <translation type="unfinished"><b>Télécharger signet</b><p>Ceci télécharge un signe d'un répertoire distant dans le répertoire local. </p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <source>Show outgoing bookmarks</source> + <translation type="unfinished">Montrer signets sortants</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> + <source>Show a list of outgoing bookmarks</source> + <translation type="unfinished">Montrer la list des signets sortants</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186"/> + <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> + <translation type="unfinished"><b>Montrer les signets sortants</b><p>Ceci montre la liste des signets disponibles dans le répertoire local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/> + <source>Push bookmark</source> + <translation type="unfinished">Envoyer signet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> + <source>Push a bookmark to a remote repository</source> + <translation type="unfinished">Envoyer un signet dans un répertoire distant</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/> + <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> + <translation type="unfinished"><b>Envoyer signet</b><p>Ceci envoie un signet depuis un répertoire local dans un répertoire distant. </p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> + <source>Bookmarks</source> + <translation type="unfinished">Signets</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <source>Tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> + <source>Branches</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>Cancel uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> - <source>Cancel an uncommitted merge and lose all changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/> - <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>List bookmarks</source> - <translation type="unfinished">Lister les signets</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>List bookmarks...</source> - <translation type="unfinished">Lister les signets ...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> - <source>List bookmarks of the project</source> - <translation type="unfinished">Lister les signets du projet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation type="unfinished"><b>Lister les signets</b><p>Ceci liste tous les signets du projet.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Define bookmark</source> - <translation type="unfinished">Définir signet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Define bookmark...</source> - <translation type="unfinished">Définir signet ...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> - <source>Define a bookmark for the project</source> - <translation type="unfinished">Définir un signet pour le projet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation type="unfinished"><b>Définir un signet</b><p>Ceci défini un signet pour le projet.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Delete bookmark</source> - <translation type="unfinished">Supprimer signet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Delete bookmark...</source> - <translation type="unfinished">Supprimer signet ...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <source>Delete a bookmark of the project</source> - <translation type="unfinished">Supprimer un signet du projet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation type="unfinished"><b>Supprimer signet</b><p>Ceci supprime un signet du projet.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Rename bookmark</source> - <translation type="unfinished">Renommer signet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Rename bookmark...</source> - <translation type="unfinished">Renommer signet ...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> - <source>Rename a bookmark of the project</source> - <translation type="unfinished">Renommer un signet du projet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation type="unfinished"><b>Renommer signet</b><p>Ceci renome un signet du projet.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source>Move bookmark</source> - <translation type="unfinished">Déplacer signet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source>Move bookmark...</source> - <translation type="unfinished">Déplacer signet ...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> - <source>Move a bookmark of the project</source> - <translation type="unfinished">Déplacer un signet du projet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> - <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> - <translation type="unfinished"><b>Déplacer signet</b><p>Ceci déplace un signet du projet dans un autre ensemble.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1144"/> - <source>Show incoming bookmarks</source> - <translation type="unfinished">Montrer nouveaux signets</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> - <source>Show a list of incoming bookmarks</source> - <translation type="unfinished">Montrer la liste des nouveaux signets</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152"/> - <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> - <translation type="unfinished"><b>Montrer les nouveaux signets</b><p>Cedi montre la liste des nouveaux signets disponibles dans le dépôt distant. </p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> - <source>Pull bookmark</source> - <translation type="unfinished">Télécharger signet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> - <source>Pull a bookmark from a remote repository</source> - <translation type="unfinished">Télecharger un sginet d'un répertoire distant</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> - <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> - <translation type="unfinished"><b>Télécharger signet</b><p>Ceci télécharge un signe d'un répertoire distant dans le répertoire local. </p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> - <source>Show outgoing bookmarks</source> - <translation type="unfinished">Montrer signets sortants</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/> - <source>Show a list of outgoing bookmarks</source> - <translation type="unfinished">Montrer la list des signets sortants</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> - <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> - <translation type="unfinished"><b>Montrer les signets sortants</b><p>Ceci montre la liste des signets disponibles dans le répertoire local.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> - <source>Push bookmark</source> - <translation type="unfinished">Envoyer signet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> - <source>Push a bookmark to a remote repository</source> - <translation type="unfinished">Envoyer un signet dans un répertoire distant</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> - <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> - <translation type="unfinished"><b>Envoyer signet</b><p>Ceci envoie un signet depuis un répertoire local dans un répertoire distant. </p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361"/> - <source>Bookmarks</source> - <translation type="unfinished">Signets</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345"/> - <source>Tags</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> - <source>Branches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <source>Re-Merge all conflicting, unresolved files of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> - <source>Re-Merge all conflicting, unresolved files of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Show conflicts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Show conflicts...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> - <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> - <source>Conflicts unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> - <source>Mark all conflicts of the local project as unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> - <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> - <source>Manage Changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> + <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <source>Mark all conflicts of the local project as unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> + <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> + <source>Manage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>Mercurial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> @@ -30363,6 +30375,42 @@ </message> </context> <context> + <name>HtmlProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/HtmlProvider.py" line="388"/> + <source>Create List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HtmlProvider.py" line="388"/> + <source>Enter desired number of list elements:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HyperlinkMarkupDialog</name> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="14"/> + <source>Insert Hyperlink</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="23"/> + <source>Link Text:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="33"/> + <source>Link Target:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="43"/> + <source>Link Title:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>IExplorerImporter</name> <message> <location filename="../WebBrowser/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="40"/> @@ -30564,1061 +30612,1086 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="128"/> + <location filename="../IconEditor/IconEditorWindow.py" line="130"/> <source>Graphic Interchange Format File (*.gif)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="129"/> + <location filename="../IconEditor/IconEditorWindow.py" line="132"/> <source>Windows Icon File (*.ico)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="130"/> + <location filename="../IconEditor/IconEditorWindow.py" line="134"/> <source>JPEG File (*.jpg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="133"/> - <source>Portable Bitmap File (*.pbm)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="135"/> - <source>Portable Graymap File (*.pgm)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="136"/> - <source>Portable Network Graphics File (*.png)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="137"/> - <source>Portable Pixmap File (*.ppm)</source> + <source>Portable Bitmap File (*.pbm)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="139"/> - <source>Scalable Vector Graphics File (*.svg)</source> + <source>Portable Graymap File (*.pgm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="140"/> + <source>Portable Network Graphics File (*.png)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="141"/> + <source>Portable Pixmap File (*.ppm)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="143"/> - <source>TIFF File (*.tif)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="146"/> - <source>X11 Bitmap File (*.xbm)</source> + <source>Scalable Vector Graphics File (*.svg)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="147"/> + <source>TIFF File (*.tif)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="151"/> + <source>X11 Bitmap File (*.xbm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="152"/> <source>X11 Pixmap File (*.xpm)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="158"/> + <location filename="../IconEditor/IconEditorWindow.py" line="163"/> <source>All Files (*)</source> <translation type="unfinished">Tous fichiers (*)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>New</source> <translation type="unfinished">Nouveau</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>&New</source> <translation type="unfinished">&Nouveau</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>Ctrl+N</source> <comment>File|New</comment> <translation type="unfinished">Ctrl+N</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="196"/> + <location filename="../IconEditor/IconEditorWindow.py" line="201"/> <source>Create a new icon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="197"/> + <location filename="../IconEditor/IconEditorWindow.py" line="202"/> <source><b>New</b><p>This creates a new icon.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="204"/> - <source>New Window</source> - <translation type="unfinished">Nouvelle fenêtre</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="204"/> - <source>New &Window</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="209"/> + <source>New Window</source> + <translation type="unfinished">Nouvelle fenêtre</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="209"/> + <source>New &Window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="214"/> <source>Open a new icon editor window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="211"/> + <location filename="../IconEditor/IconEditorWindow.py" line="216"/> <source><b>New Window</b><p>This opens a new icon editor window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>Open</source> <translation type="unfinished">Ouvrir</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>&Open...</source> <translation type="unfinished">&Ouvrir...</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>Ctrl+O</source> <comment>File|Open</comment> <translation type="unfinished">Ctrl+O</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="224"/> + <location filename="../IconEditor/IconEditorWindow.py" line="229"/> <source>Open an icon file for editing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="225"/> + <location filename="../IconEditor/IconEditorWindow.py" line="230"/> <source><b>Open File</b><p>This opens a new icon file for editing. It pops up a file selection dialog.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>&Save</source> <translation type="unfinished">&Enregistrer</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>Ctrl+S</source> <comment>File|Save</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="239"/> + <location filename="../IconEditor/IconEditorWindow.py" line="244"/> <source>Save the current icon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="240"/> + <location filename="../IconEditor/IconEditorWindow.py" line="245"/> <source><b>Save File</b><p>Save the contents of the icon editor window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Save As</source> <translation type="unfinished">Enregistrer sous</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Save &As...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Shift+Ctrl+S</source> <comment>File|Save As</comment> <translation type="unfinished">Shift+Ctrl+S</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="253"/> + <location filename="../IconEditor/IconEditorWindow.py" line="258"/> <source>Save the current icon to a new file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="255"/> + <location filename="../IconEditor/IconEditorWindow.py" line="260"/> <source><b>Save As...</b><p>Saves the current icon to a new file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>Close</source> <translation type="unfinished">Fermer</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>&Close</source> <translation type="unfinished">&Fermer</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>Ctrl+W</source> <comment>File|Close</comment> <translation type="unfinished">Ctrl+W</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="268"/> + <location filename="../IconEditor/IconEditorWindow.py" line="273"/> <source>Close the current icon editor window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="270"/> + <location filename="../IconEditor/IconEditorWindow.py" line="275"/> <source><b>Close</b><p>Closes the current icon editor window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="277"/> + <location filename="../IconEditor/IconEditorWindow.py" line="282"/> <source>Close All</source> <translation type="unfinished">Tout fermer</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="277"/> + <location filename="../IconEditor/IconEditorWindow.py" line="282"/> <source>Close &All</source> <translation type="unfinished">&Tout fermer</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="281"/> + <location filename="../IconEditor/IconEditorWindow.py" line="286"/> <source>Close all icon editor windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="283"/> + <location filename="../IconEditor/IconEditorWindow.py" line="288"/> <source><b>Close All</b><p>Closes all icon editor windows except the first one.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>Quit</source> <translation type="unfinished">Quitter</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>&Quit</source> <translation type="unfinished">&Quitter</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>Ctrl+Q</source> <comment>File|Quit</comment> <translation type="unfinished">Ctrl+Q</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="309"/> + <location filename="../IconEditor/IconEditorWindow.py" line="314"/> <source>Quit the icon editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="310"/> + <location filename="../IconEditor/IconEditorWindow.py" line="315"/> <source><b>Quit</b><p>Quit the icon editor.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Undo</source> <translation type="unfinished">Défaire</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>&Undo</source> <translation type="unfinished">&Défaire</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Ctrl+Z</source> <comment>Edit|Undo</comment> <translation type="unfinished">Ctrl+Z</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Alt+Backspace</source> <comment>Edit|Undo</comment> <translation type="unfinished">Alt+Backspace</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="329"/> + <location filename="../IconEditor/IconEditorWindow.py" line="334"/> <source>Undo the last change</source> <translation type="unfinished">Annule la dernière modification</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="330"/> + <location filename="../IconEditor/IconEditorWindow.py" line="335"/> <source><b>Undo</b><p>Undo the last change done.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>Redo</source> <translation type="unfinished">Refaire</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>&Redo</source> <translation type="unfinished">&Refaire</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>Ctrl+Shift+Z</source> <comment>Edit|Redo</comment> <translation type="unfinished">Ctrl+Shift+Z</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="343"/> + <location filename="../IconEditor/IconEditorWindow.py" line="348"/> <source>Redo the last change</source> <translation type="unfinished">Recharge la dernière modification</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="344"/> + <location filename="../IconEditor/IconEditorWindow.py" line="349"/> <source><b>Redo</b><p>Redo the last change done.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Cut</source> <translation type="unfinished">Couper</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Cu&t</source> <translation type="unfinished">Cou&per</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Ctrl+X</source> <comment>Edit|Cut</comment> <translation type="unfinished">Ctrl+X</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Shift+Del</source> <comment>Edit|Cut</comment> <translation type="unfinished">Shift+Del</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="358"/> + <location filename="../IconEditor/IconEditorWindow.py" line="363"/> <source>Cut the selection</source> <translation type="unfinished">Coupe la sélection</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="359"/> + <location filename="../IconEditor/IconEditorWindow.py" line="364"/> <source><b>Cut</b><p>Cut the selected image area to the clipboard.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Copy</source> <translation type="unfinished">Copier</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>&Copy</source> <translation type="unfinished">&Copier</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Ctrl+C</source> <comment>Edit|Copy</comment> <translation type="unfinished">Ctrl+C</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Ctrl+Ins</source> <comment>Edit|Copy</comment> <translation type="unfinished">Ctrl+Ins</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="373"/> + <location filename="../IconEditor/IconEditorWindow.py" line="378"/> <source>Copy the selection</source> <translation type="unfinished">Copie la sélection</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="374"/> + <location filename="../IconEditor/IconEditorWindow.py" line="379"/> <source><b>Copy</b><p>Copy the selected image area to the clipboard.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Paste</source> <translation type="unfinished">Coller</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>&Paste</source> <translation type="unfinished">Col&ler</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Ctrl+V</source> <comment>Edit|Paste</comment> <translation type="unfinished">Ctrl+V</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Shift+Ins</source> <comment>Edit|Paste</comment> <translation type="unfinished">Shift+Ins</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="388"/> + <location filename="../IconEditor/IconEditorWindow.py" line="393"/> <source>Paste the clipboard image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="389"/> + <location filename="../IconEditor/IconEditorWindow.py" line="394"/> <source><b>Paste</b><p>Paste the clipboard image.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="396"/> + <location filename="../IconEditor/IconEditorWindow.py" line="401"/> <source>Paste as New</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="396"/> + <location filename="../IconEditor/IconEditorWindow.py" line="401"/> <source>Paste as &New</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="400"/> + <location filename="../IconEditor/IconEditorWindow.py" line="405"/> <source>Paste the clipboard image replacing the current one</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="402"/> + <location filename="../IconEditor/IconEditorWindow.py" line="407"/> <source><b>Paste as New</b><p>Paste the clipboard image replacing the current one.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Clear</source> <translation type="unfinished">Effacer</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Cl&ear</source> <translation type="unfinished">Ef&facer</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Alt+Shift+C</source> <comment>Edit|Clear</comment> <translation type="unfinished">Alt+Shift+C</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="416"/> + <location filename="../IconEditor/IconEditorWindow.py" line="421"/> <source>Clear the icon image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="417"/> + <location filename="../IconEditor/IconEditorWindow.py" line="422"/> <source><b>Clear</b><p>Clear the icon image and set it to be completely transparent.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>Select All</source> <translation type="unfinished">Tout sélectionner</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>&Select All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>Ctrl+A</source> <comment>Edit|Select All</comment> <translation type="unfinished">Ctrl+A</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="431"/> + <location filename="../IconEditor/IconEditorWindow.py" line="436"/> <source>Select the complete icon image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="433"/> + <location filename="../IconEditor/IconEditorWindow.py" line="438"/> <source><b>Select All</b><p>Selects the complete icon image.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="440"/> + <location filename="../IconEditor/IconEditorWindow.py" line="445"/> <source>Change Size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="440"/> + <location filename="../IconEditor/IconEditorWindow.py" line="445"/> <source>Change Si&ze...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="446"/> + <location filename="../IconEditor/IconEditorWindow.py" line="451"/> <source>Change the icon size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="447"/> + <location filename="../IconEditor/IconEditorWindow.py" line="452"/> <source><b>Change Size...</b><p>Changes the icon size.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="454"/> + <location filename="../IconEditor/IconEditorWindow.py" line="459"/> <source>Grayscale</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="454"/> + <location filename="../IconEditor/IconEditorWindow.py" line="459"/> <source>&Grayscale</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="460"/> + <location filename="../IconEditor/IconEditorWindow.py" line="465"/> <source>Change the icon to grayscale</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="462"/> + <location filename="../IconEditor/IconEditorWindow.py" line="467"/> <source><b>Grayscale</b><p>Changes the icon to grayscale.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Zoom in</source> <translation type="unfinished">Zoom avant</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Zoom &in</source> <translation type="unfinished">Zoom a&vant</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Ctrl++</source> <comment>View|Zoom in</comment> <translation type="unfinished">Ctrl++</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="497"/> + <location filename="../IconEditor/IconEditorWindow.py" line="502"/> <source>Zoom in on the icon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="498"/> + <location filename="../IconEditor/IconEditorWindow.py" line="503"/> <source><b>Zoom in</b><p>Zoom in on the icon. This makes the grid bigger.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Zoom out</source> <translation type="unfinished">Zoom arrière</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Zoom &out</source> <translation type="unfinished">Zoom a&rrière</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Ctrl+-</source> <comment>View|Zoom out</comment> <translation type="unfinished">Ctrl+-</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="511"/> + <location filename="../IconEditor/IconEditorWindow.py" line="516"/> <source>Zoom out on the icon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="512"/> + <location filename="../IconEditor/IconEditorWindow.py" line="517"/> <source><b>Zoom out</b><p>Zoom out on the icon. This makes the grid smaller.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Zoom reset</source> <translation type="unfinished">Annulation du zoom</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Zoom &reset</source> <translation type="unfinished">Annulation du &zoom</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Ctrl+0</source> <comment>View|Zoom reset</comment> <translation type="unfinished">Ctrl+0</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="535"/> + <location filename="../IconEditor/IconEditorWindow.py" line="540"/> <source>Show Grid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="535"/> + <location filename="../IconEditor/IconEditorWindow.py" line="540"/> <source>Show &Grid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="541"/> + <location filename="../IconEditor/IconEditorWindow.py" line="546"/> <source>Toggle the display of the grid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="543"/> + <location filename="../IconEditor/IconEditorWindow.py" line="548"/> <source><b>Show Grid</b><p>Toggle the display of the grid.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="562"/> + <location filename="../IconEditor/IconEditorWindow.py" line="567"/> <source>Freehand</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="562"/> + <location filename="../IconEditor/IconEditorWindow.py" line="567"/> <source>&Freehand</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="568"/> + <location filename="../IconEditor/IconEditorWindow.py" line="573"/> <source><b>Free hand</b><p>Draws non linear lines.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="577"/> + <location filename="../IconEditor/IconEditorWindow.py" line="582"/> <source>Color Picker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="577"/> + <location filename="../IconEditor/IconEditorWindow.py" line="582"/> <source>&Color Picker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="583"/> + <location filename="../IconEditor/IconEditorWindow.py" line="588"/> <source><b>Color Picker</b><p>The color of the pixel clicked on will become the current draw color.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="594"/> + <location filename="../IconEditor/IconEditorWindow.py" line="599"/> <source>Rectangle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="594"/> + <location filename="../IconEditor/IconEditorWindow.py" line="599"/> <source>&Rectangle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="600"/> + <location filename="../IconEditor/IconEditorWindow.py" line="605"/> <source><b>Rectangle</b><p>Draw a rectangle.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="609"/> + <location filename="../IconEditor/IconEditorWindow.py" line="614"/> <source>Filled Rectangle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="609"/> + <location filename="../IconEditor/IconEditorWindow.py" line="614"/> <source>F&illed Rectangle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="615"/> + <location filename="../IconEditor/IconEditorWindow.py" line="620"/> <source><b>Filled Rectangle</b><p>Draw a filled rectangle.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="625"/> + <location filename="../IconEditor/IconEditorWindow.py" line="630"/> <source>Circle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="631"/> + <location filename="../IconEditor/IconEditorWindow.py" line="636"/> <source><b>Circle</b><p>Draw a circle.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="640"/> + <location filename="../IconEditor/IconEditorWindow.py" line="645"/> <source>Filled Circle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="640"/> + <location filename="../IconEditor/IconEditorWindow.py" line="645"/> <source>Fille&d Circle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="646"/> + <location filename="../IconEditor/IconEditorWindow.py" line="651"/> <source><b>Filled Circle</b><p>Draw a filled circle.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="656"/> + <location filename="../IconEditor/IconEditorWindow.py" line="661"/> <source>Ellipse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="656"/> + <location filename="../IconEditor/IconEditorWindow.py" line="661"/> <source>&Ellipse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="662"/> + <location filename="../IconEditor/IconEditorWindow.py" line="667"/> <source><b>Ellipse</b><p>Draw an ellipse.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="671"/> + <location filename="../IconEditor/IconEditorWindow.py" line="676"/> <source>Filled Ellipse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="671"/> + <location filename="../IconEditor/IconEditorWindow.py" line="676"/> <source>Fille&d Elli&pse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="677"/> + <location filename="../IconEditor/IconEditorWindow.py" line="682"/> <source><b>Filled Ellipse</b><p>Draw a filled ellipse.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="687"/> + <location filename="../IconEditor/IconEditorWindow.py" line="692"/> <source>Flood Fill</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="687"/> + <location filename="../IconEditor/IconEditorWindow.py" line="692"/> <source>Fl&ood Fill</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="693"/> + <location filename="../IconEditor/IconEditorWindow.py" line="698"/> <source><b>Flood Fill</b><p>Fill adjoining pixels with the same color with the current color.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="703"/> + <location filename="../IconEditor/IconEditorWindow.py" line="708"/> <source>Line</source> <translation type="unfinished">Ligne</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="703"/> + <location filename="../IconEditor/IconEditorWindow.py" line="708"/> <source>&Line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="709"/> + <location filename="../IconEditor/IconEditorWindow.py" line="714"/> <source><b>Line</b><p>Draw a line.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="718"/> + <location filename="../IconEditor/IconEditorWindow.py" line="723"/> <source>Eraser (Transparent)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="718"/> + <location filename="../IconEditor/IconEditorWindow.py" line="723"/> <source>Eraser (&Transparent)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="724"/> + <location filename="../IconEditor/IconEditorWindow.py" line="729"/> <source><b>Eraser (Transparent)</b><p>Erase pixels by setting them to transparent.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="733"/> + <location filename="../IconEditor/IconEditorWindow.py" line="738"/> <source>Rectangular Selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="750"/> + <location filename="../IconEditor/IconEditorWindow.py" line="755"/> <source>Rect&angular Selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="739"/> + <location filename="../IconEditor/IconEditorWindow.py" line="744"/> <source><b>Rectangular Selection</b><p>Select a rectangular section of the icon using the mouse.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="750"/> + <location filename="../IconEditor/IconEditorWindow.py" line="755"/> <source>Circular Selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="756"/> + <location filename="../IconEditor/IconEditorWindow.py" line="761"/> <source><b>Circular Selection</b><p>Select a circular section of the icon using the mouse.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="773"/> + <location filename="../IconEditor/IconEditorWindow.py" line="778"/> <source>About</source> <translation type="unfinished">À propos de</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="773"/> + <location filename="../IconEditor/IconEditorWindow.py" line="778"/> <source>&About</source> <translation type="unfinished">&À propos de </translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="777"/> + <location filename="../IconEditor/IconEditorWindow.py" line="782"/> <source>Display information about this software</source> <translation type="unfinished">Affiche les informations concernant le logiciel</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="779"/> + <location filename="../IconEditor/IconEditorWindow.py" line="784"/> <source><b>About</b><p>Display some information about this software.</p></source> <translation type="unfinished"><b>À propos de</b><p>Affiche certaines informations concernant le logiciel.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="785"/> + <location filename="../IconEditor/IconEditorWindow.py" line="790"/> <source>About Qt</source> <translation type="unfinished">À propos de Qt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="785"/> + <location filename="../IconEditor/IconEditorWindow.py" line="790"/> <source>About &Qt</source> <translation type="unfinished">À propos de &Qt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="789"/> + <location filename="../IconEditor/IconEditorWindow.py" line="794"/> <source>Display information about the Qt toolkit</source> <translation type="unfinished">Affiche les informations concernant Qt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="791"/> + <location filename="../IconEditor/IconEditorWindow.py" line="796"/> <source><b>About Qt</b><p>Display some information about the Qt toolkit.</p></source> <translation type="unfinished"><b>À propos de Qt</b><p>Affiche les informations concernant Qt</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>What's This?</source> <translation type="unfinished">Qu'est-ce que c'est ?</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>&What's This?</source> <translation type="unfinished">&Qu'est-ce que c'est?</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>Shift+F1</source> <comment>Help|What's This?'</comment> <translation type="unfinished">Shift+F1</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="804"/> + <location filename="../IconEditor/IconEditorWindow.py" line="809"/> <source>Context sensitive help</source> <translation type="unfinished">Aide contextuelle</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="805"/> + <location filename="../IconEditor/IconEditorWindow.py" line="810"/> <source><b>Display context sensitive help</b><p>In What's This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.</p></source> <translation type="unfinished"><b>Affiche l'aide contextuelle</b><p>Dans le mode "Qu'est-ce que c'est?", la souris est affichée avec un point d'interrogation, et on peut cliquer sur les éléments de l'interface pour obtenir une courte description de l'élément. Cette fonction peut être obtenue avec le bouton d'aide contextuelle de la barre principale.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="822"/> + <location filename="../IconEditor/IconEditorWindow.py" line="827"/> <source>&File</source> <translation type="unfinished">&Fichier</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="839"/> + <location filename="../IconEditor/IconEditorWindow.py" line="844"/> <source>&Edit</source> <translation type="unfinished">&Edition</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="855"/> + <location filename="../IconEditor/IconEditorWindow.py" line="860"/> <source>&View</source> <translation type="unfinished">&Affichage</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="863"/> + <location filename="../IconEditor/IconEditorWindow.py" line="868"/> <source>&Tools</source> <translation type="unfinished">&Outils</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="882"/> + <location filename="../IconEditor/IconEditorWindow.py" line="887"/> <source>&Help</source> <translation type="unfinished">A&ide</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="892"/> + <location filename="../IconEditor/IconEditorWindow.py" line="897"/> <source>File</source> <translation type="unfinished">Fichier</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="906"/> + <location filename="../IconEditor/IconEditorWindow.py" line="911"/> <source>Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="919"/> - <source>View</source> - <translation type="unfinished">Affichage</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="924"/> + <source>View</source> + <translation type="unfinished">Affichage</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="929"/> <source>Tools</source> <translation type="unfinished">Outils</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="942"/> + <location filename="../IconEditor/IconEditorWindow.py" line="947"/> <source>Help</source> <translation type="unfinished">Aide</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="956"/> + <location filename="../IconEditor/IconEditorWindow.py" line="961"/> <source><p>This part of the status bar displays the icon size.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="963"/> + <location filename="../IconEditor/IconEditorWindow.py" line="968"/> <source><p>This part of the status bar displays the cursor position.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1059"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1064"/> <source>Open icon file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1109"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1114"/> <source>Save icon file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1198"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1203"/> <source>Icon saved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1213"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1218"/> <source>Untitled</source> <translation type="unfinished">SansTitre</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1217"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1222"/> <source>Icon Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="132"/> + <location filename="../IconEditor/IconEditorWindow.py" line="136"/> <source>Multiple-Image Network Graphics File (*.mng)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="525"/> + <location filename="../IconEditor/IconEditorWindow.py" line="530"/> <source>Reset the zoom of the icon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="527"/> + <location filename="../IconEditor/IconEditorWindow.py" line="532"/> <source><b>Zoom reset</b><p>Reset the zoom of the icon. This sets the zoom factor to 100%.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="134"/> - <source>Paintbrush Bitmap File (*.pcx)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="138"/> - <source>Silicon Graphics Image File (*.sgi)</source> + <source>Paintbrush Bitmap File (*.pcx)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="142"/> + <source>Silicon Graphics Image File (*.sgi)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="146"/> <source>Targa Graphic File (*.tga)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1145"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1150"/> <source>The file '{0}' does not exist.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1152"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1157"/> <source>Cannot read file '{0}: {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1186"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1191"/> <source>Cannot write file '{0}: {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1217"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1222"/> <source>{0}[*] - {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1109"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1114"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>Le fichier <b>{0}</b>existe déjà. Écraser ?</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1238"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1243"/> <source>The icon image has unsaved changes.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../IconEditor/IconEditorWindow.py" line="135"/> + <source>JPEG File (*.jpeg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="144"/> + <source>Compressed Scalable Vector Graphics File (*.svgz)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="148"/> + <source>TIFF File (*.tiff)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="149"/> + <source>WAP Bitmap File (*.wbmp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="1243"/> + <source>eric6 Icon Editor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="1333"/> + <source>About eric6 Icon Editor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="1333"/> + <source>The eric6 Icon Editor is a simple editor component to perform icon drawing tasks.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="295"/> + <source>Close Others</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="299"/> + <source>Close all other icon editor windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="301"/> + <source><b>Close Others</b><p>Closes all other icon editor windows.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="150"/> + <source>WebP Image File (*.webp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="128"/> + <source>Windows Cursor File (*.cur)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="129"/> + <source>DirectDraw-Surface File (*.dds)</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../IconEditor/IconEditorWindow.py" line="131"/> - <source>JPEG File (*.jpeg)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="140"/> - <source>Compressed Scalable Vector Graphics File (*.svgz)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="144"/> - <source>TIFF File (*.tiff)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="145"/> - <source>WAP Bitmap File (*.wbmp)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1238"/> - <source>eric6 Icon Editor</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1328"/> - <source>About eric6 Icon Editor</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1328"/> - <source>The eric6 Icon Editor is a simple editor component to perform icon drawing tasks.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="290"/> - <source>Close Others</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="294"/> - <source>Close all other icon editor windows</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="296"/> - <source><b>Close Others</b><p>Closes all other icon editor windows.</p></source> + <source>Apple Icon File (*.icns)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="133"/> + <source>JPEG2000 File (*.jp2)</source> <translation type="unfinished"></translation> </message> </context> @@ -31727,6 +31800,189 @@ </message> </context> <context> + <name>ImageMarkupDialog</name> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="53"/> + <source>Windows Bitmap File (*.bmp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="54"/> + <source>Windows Cursor File (*.cur)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="55"/> + <source>DirectDraw-Surface File (*.dds)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="56"/> + <source>Graphic Interchange Format File (*.gif)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="57"/> + <source>Apple Icon File (*.icns)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="58"/> + <source>Windows Icon File (*.ico)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="59"/> + <source>JPEG2000 File (*.jp2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="60"/> + <source>JPEG File (*.jpg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="61"/> + <source>JPEG File (*.jpeg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="62"/> + <source>Multiple-Image Network Graphics File (*.mng)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="63"/> + <source>Portable Bitmap File (*.pbm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="64"/> + <source>Paintbrush Bitmap File (*.pcx)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="65"/> + <source>Portable Graymap File (*.pgm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="66"/> + <source>Portable Network Graphics File (*.png)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="67"/> + <source>Portable Pixmap File (*.ppm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="68"/> + <source>Silicon Graphics Image File (*.sgi)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="69"/> + <source>Scalable Vector Graphics File (*.svg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="70"/> + <source>Compressed Scalable Vector Graphics File (*.svgz)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="72"/> + <source>Targa Graphic File (*.tga)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="73"/> + <source>TIFF File (*.tif)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="74"/> + <source>TIFF File (*.tiff)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="75"/> + <source>WAP Bitmap File (*.wbmp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="76"/> + <source>WebP Image File (*.webp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="77"/> + <source>X11 Bitmap File (*.xbm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="78"/> + <source>X11 Pixmap File (*.xpm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="89"/> + <source>All Files (*)</source> + <translation type="unfinished">Tous fichiers (*)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="14"/> + <source>Add Image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="25"/> + <source>Image Address:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="41"/> + <source>Enter the image path or URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="48"/> + <source>Title:</source> + <translation type="unfinished">Titre:</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="58"/> + <source>Alternative Text:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="73"/> + <source>Keep Original Size</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="80"/> + <source>Keep Aspect Ratio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="89"/> + <source>Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="119"/> + <source> px</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="109"/> + <source>Height:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ImagesIcon</name> <message> <location filename="../WebBrowser/StatusBar/ImagesIcon.py" line="40"/> @@ -34629,7 +34885,7 @@ <translation>Sélectionne un analyseur syntaxique alternatif</translation> </message> <message> - <location filename="../Project/LexerAssociationDialog.py" line="131"/> + <location filename="../Project/LexerAssociationDialog.py" line="134"/> <source>Alternative</source> <translation>Alternatif</translation> </message> @@ -34965,317 +35221,317 @@ <translation>Makefile</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="117"/> + <location filename="../QScintilla/Lexers/__init__.py" line="121"/> <source>Perl</source> <translation>Perl</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="121"/> + <location filename="../QScintilla/Lexers/__init__.py" line="125"/> <source>Povray</source> <translation>Povray</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="123"/> + <location filename="../QScintilla/Lexers/__init__.py" line="127"/> <source>Properties</source> <translation>Propriétés</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="131"/> + <location filename="../QScintilla/Lexers/__init__.py" line="135"/> <source>Ruby</source> <translation>Ruby</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="133"/> - <source>SQL</source> - <translation>SQL</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="137"/> + <source>SQL</source> + <translation>SQL</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="141"/> <source>TeX</source> <translation>TeX</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="139"/> + <location filename="../QScintilla/Lexers/__init__.py" line="143"/> <source>VHDL</source> <translation>VHDL</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="547"/> + <location filename="../QScintilla/Lexers/__init__.py" line="565"/> <source>Pyrex Files (*.pyx)</source> <translation>Fichiers Pyrex (*.pyx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="550"/> - <source>Quixote Template Files (*.ptl)</source> - <translation>Fichiers gabarits Quixote (*.ptl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="553"/> - <source>Ruby Files (*.rb)</source> - <translation>Fichiers Ruby (*.rb)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="556"/> - <source>IDL Files (*.idl)</source> - <translation>Fichiers IDL (*.idl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="383"/> - <source>C Files (*.h *.c)</source> - <translation>Fichiers C (*.h *.c)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="386"/> - <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> - <translation>Fichiers C++ (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="568"/> + <source>Quixote Template Files (*.ptl)</source> + <translation>Fichiers gabarits Quixote (*.ptl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="571"/> + <source>Ruby Files (*.rb)</source> + <translation>Fichiers Ruby (*.rb)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="574"/> + <source>IDL Files (*.idl)</source> + <translation>Fichiers IDL (*.idl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="393"/> + <source>C Files (*.h *.c)</source> + <translation>Fichiers C (*.h *.c)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="396"/> + <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> + <translation>Fichiers C++ (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="586"/> <source>C# Files (*.cs)</source> <translation>Fichiers C# (*.cs)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="392"/> + <location filename="../QScintilla/Lexers/__init__.py" line="402"/> <source>HTML Files (*.html *.htm *.asp *.shtml)</source> <translation>Fichiers HTML (*.html *.htm *.asp *.shtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="580"/> + <location filename="../QScintilla/Lexers/__init__.py" line="598"/> <source>CSS Files (*.css)</source> <translation>Fichiers CSS (*.css)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="583"/> + <location filename="../QScintilla/Lexers/__init__.py" line="601"/> <source>QSS Files (*.qss)</source> <translation>Fichiers QSS (*.qss)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="401"/> + <location filename="../QScintilla/Lexers/__init__.py" line="411"/> <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> <translation>Fichiers PHP (*.php *.php3 *.php4 *.php5 *.phtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="595"/> - <source>Qt Resource Files (*.qrc)</source> - <translation>Fichiers Qt Resource (*.qrc)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="410"/> - <source>D Files (*.d *.di)</source> - <translation>Fichiers D (*.d *.di)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="604"/> - <source>Java Files (*.java)</source> - <translation>Fichiers Java (*.java)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="607"/> - <source>JavaScript Files (*.js)</source> - <translation>Fichiers JavaScript (*.js)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="610"/> - <source>SQL Files (*.sql)</source> - <translation>Fichiers SQL (*.sql)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="613"/> - <source>Docbook Files (*.docbook)</source> - <translation>Fichiers Docbook (*.docbook)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="425"/> - <source>Perl Files (*.pl *.pm *.ph)</source> - <translation>Fichiers Perl (*.pl *.pm *.ph)</translation> + <source>Qt Resource Files (*.qrc)</source> + <translation>Fichiers Qt Resource (*.qrc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="420"/> + <source>D Files (*.d *.di)</source> + <translation>Fichiers D (*.d *.di)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="622"/> - <source>Lua Files (*.lua)</source> - <translation>Fichiers Lua (*.lua)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="431"/> - <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> - <translation>Fichiers Tex (*.tex *.sty *.aux *.toc *.idx)</translation> + <source>Java Files (*.java)</source> + <translation>Fichiers Java (*.java)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="625"/> + <source>JavaScript Files (*.js)</source> + <translation>Fichiers JavaScript (*.js)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="628"/> + <source>SQL Files (*.sql)</source> + <translation>Fichiers SQL (*.sql)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="631"/> + <source>Docbook Files (*.docbook)</source> + <translation>Fichiers Docbook (*.docbook)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="435"/> + <source>Perl Files (*.pl *.pm *.ph)</source> + <translation>Fichiers Perl (*.pl *.pm *.ph)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="640"/> + <source>Lua Files (*.lua)</source> + <translation>Fichiers Lua (*.lua)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="441"/> + <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> + <translation>Fichiers Tex (*.tex *.sty *.aux *.toc *.idx)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="643"/> <source>Shell Files (*.sh)</source> <translation>Fichiers Shell (*.sh)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="437"/> + <location filename="../QScintilla/Lexers/__init__.py" line="447"/> <source>Batch Files (*.bat *.cmd)</source> <translation>Fichiers Batch (*.bat *.cmd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="440"/> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> <source>Diff Files (*.diff *.patch)</source> <translation>Fichiers Diff (*.diff *.patch)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="443"/> - <source>Makefiles (*.mak)</source> - <translation>Makefiles (*.mak)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="446"/> - <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> - <translation>Fichiers de configuration (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="649"/> - <source>Povray Files (*.pov)</source> - <translation>Fichiers Povray (*.pov)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="453"/> - <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> - <translation>Fichiers CMake (CMakeLists.txt *.cmake *.ctest)</translation> + <source>Makefiles (*.mak)</source> + <translation>Makefiles (*.mak)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="456"/> + <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> + <translation>Fichiers de configuration (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="667"/> + <source>Povray Files (*.pov)</source> + <translation>Fichiers Povray (*.pov)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="463"/> + <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> + <translation>Fichiers CMake (CMakeLists.txt *.cmake *.ctest)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="466"/> <source>VHDL Files (*.vhd *.vhdl)</source> <translation>Fichiers VHDL (*.vhd *.vhdl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="718"/> + <location filename="../QScintilla/Lexers/__init__.py" line="744"/> <source>All Files (*)</source> <translation>Tous fichiers (*)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="135"/> + <location filename="../QScintilla/Lexers/__init__.py" line="139"/> <source>TCL</source> <translation>TCL</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="459"/> + <location filename="../QScintilla/Lexers/__init__.py" line="469"/> <source>TCL/Tk Files (*.tcl *.tk)</source> <translation>Fichiers TCL/Tk (*.tcl *.tk)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="559"/> - <source>C Files (*.c)</source> - <translation>Fichiers C (*.c)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="562"/> - <source>C++ Files (*.cpp)</source> - <translation>Fichiers C++ (*.cpp)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="565"/> - <source>C++/C Header Files (*.h)</source> - <translation>Fichiers headers C++/C (*.h)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="571"/> - <source>HTML Files (*.html)</source> - <translation>Fichiers HTML (*.html)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="574"/> - <source>PHP Files (*.php)</source> - <translation>Fichiers PHP (*.php)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="577"/> - <source>ASP Files (*.asp)</source> - <translation>Fichiers ASP (*.asp)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="586"/> - <source>XML Files (*.xml)</source> - <translation>Fichiers XML (*.xml)</translation> + <source>C Files (*.c)</source> + <translation>Fichiers C (*.c)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="580"/> + <source>C++ Files (*.cpp)</source> + <translation>Fichiers C++ (*.cpp)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="583"/> + <source>C++/C Header Files (*.h)</source> + <translation>Fichiers headers C++/C (*.h)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="589"/> - <source>XSL Files (*.xsl)</source> - <translation>Fichiers XSL (*.xsl)</translation> + <source>HTML Files (*.html)</source> + <translation>Fichiers HTML (*.html)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="592"/> + <source>PHP Files (*.php)</source> + <translation>Fichiers PHP (*.php)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="595"/> + <source>ASP Files (*.asp)</source> + <translation>Fichiers ASP (*.asp)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="604"/> + <source>XML Files (*.xml)</source> + <translation>Fichiers XML (*.xml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="607"/> + <source>XSL Files (*.xsl)</source> + <translation>Fichiers XSL (*.xsl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="610"/> <source>DTD Files (*.dtd)</source> <translation>Fichiers DTD (*.dtd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="598"/> - <source>D Files (*.d)</source> - <translation>Fichiers D (*.d)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="601"/> - <source>D Interface Files (*.di)</source> - <translation>Fichiers Interface D (*.di)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="616"/> - <source>Perl Files (*.pl)</source> - <translation>Fichiers Perl (*.pl)</translation> + <source>D Files (*.d)</source> + <translation>Fichiers D (*.d)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="619"/> - <source>Perl Module Files (*.pm)</source> - <translation>Fichiers module Perl (*.pm)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="628"/> - <source>Batch Files (*.bat)</source> - <translation>Fichiers Batch (*.bat)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="631"/> - <source>TeX Files (*.tex)</source> - <translation>Fichiers TeX (*.tex)</translation> + <source>D Interface Files (*.di)</source> + <translation>Fichiers Interface D (*.di)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="634"/> - <source>TeX Template Files (*.sty)</source> - <translation>Fichiers Template TeX (*.sty)</translation> + <source>Perl Files (*.pl)</source> + <translation>Fichiers Perl (*.pl)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="637"/> - <source>Diff Files (*.diff)</source> - <translation>Fichiers Diff (*.diff)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="640"/> - <source>Make Files (*.mak)</source> - <translation>Fichiers Make (*.mak)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="643"/> - <source>Properties Files (*.ini)</source> - <translation>Fichiers de propriétés (*.ini)</translation> + <source>Perl Module Files (*.pm)</source> + <translation>Fichiers module Perl (*.pm)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="646"/> - <source>Configuration Files (*.cfg)</source> - <translation>Fichiers de configuration (*.cfg)</translation> + <source>Batch Files (*.bat)</source> + <translation>Fichiers Batch (*.bat)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="649"/> + <source>TeX Files (*.tex)</source> + <translation>Fichiers TeX (*.tex)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="652"/> - <source>CMake Files (CMakeLists.txt)</source> - <translation>Fichiers CMake (CMakeLists.txt)</translation> + <source>TeX Template Files (*.sty)</source> + <translation>Fichiers Template TeX (*.sty)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="655"/> - <source>CMake Macro Files (*.cmake)</source> - <translation>Fichiers Macro CMake (*.cmake)</translation> + <source>Diff Files (*.diff)</source> + <translation>Fichiers Diff (*.diff)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="658"/> - <source>VHDL Files (*.vhd)</source> - <translation>Fichiers VHDL (*.vhd)</translation> + <source>Make Files (*.mak)</source> + <translation>Fichiers Make (*.mak)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="661"/> - <source>TCL Files (*.tcl)</source> - <translation>Fichiers TCL (*.tcl)</translation> + <source>Properties Files (*.ini)</source> + <translation>Fichiers de propriétés (*.ini)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="664"/> + <source>Configuration Files (*.cfg)</source> + <translation>Fichiers de configuration (*.cfg)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="670"/> + <source>CMake Files (CMakeLists.txt)</source> + <translation>Fichiers CMake (CMakeLists.txt)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="673"/> + <source>CMake Macro Files (*.cmake)</source> + <translation>Fichiers Macro CMake (*.cmake)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="676"/> + <source>VHDL Files (*.vhd)</source> + <translation>Fichiers VHDL (*.vhd)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="679"/> + <source>TCL Files (*.tcl)</source> + <translation>Fichiers TCL (*.tcl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="682"/> <source>Tk Files (*.tk)</source> <translation>Fichiers Tk (*.tk)</translation> </message> @@ -35290,175 +35546,195 @@ <translation>Fortran77</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="115"/> + <location filename="../QScintilla/Lexers/__init__.py" line="119"/> <source>Pascal</source> <translation>Pascal</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="119"/> + <location filename="../QScintilla/Lexers/__init__.py" line="123"/> <source>PostScript</source> <translation>PostScript</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="141"/> + <location filename="../QScintilla/Lexers/__init__.py" line="145"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="143"/> + <location filename="../QScintilla/Lexers/__init__.py" line="147"/> <source>YAML</source> <translation>YAML</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="404"/> + <location filename="../QScintilla/Lexers/__init__.py" line="414"/> <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> <translation>Fichiers XML (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="462"/> + <location filename="../QScintilla/Lexers/__init__.py" line="472"/> <source>Fortran Files (*.f90 *.f95 *.f2k)</source> <translation>Fichiers Fortran (*.f90 *.f95 *.f2k)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="465"/> + <location filename="../QScintilla/Lexers/__init__.py" line="475"/> <source>Fortran77 Files (*.f *.for)</source> <translation>Fichiers Fortran77 (*.f *.for)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="468"/> + <location filename="../QScintilla/Lexers/__init__.py" line="478"/> <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> <translation>Fichiers Pascal (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="676"/> + <location filename="../QScintilla/Lexers/__init__.py" line="694"/> <source>PostScript Files (*.ps)</source> <translation>Fichiers PostScript (*.ps)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="474"/> + <location filename="../QScintilla/Lexers/__init__.py" line="484"/> <source>YAML Files (*.yaml *.yml)</source> <translation>Fichiers YAML (*.yaml *.yml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="667"/> - <source>Fortran Files (*.f95)</source> - <translation>Fichiers Fortran (*.f95)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="670"/> - <source>Fortran77 Files (*.f)</source> - <translation>Fichiers Fortran77 (*.f)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="673"/> - <source>Pascal Files (*.pas)</source> - <translation>Fichiers Pascal (*.pas)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="679"/> - <source>YAML Files (*.yml)</source> - <translation>Fichiers YAML (*.yml)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="171"/> - <source>Pygments</source> - <translation>Pygments</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="365"/> - <source>Python Files (*.py *.py2 *.py3)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="368"/> - <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="538"/> - <source>Python3 Files (*.py)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="544"/> - <source>Python3 GUI Files (*.pyw)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="535"/> - <source>Python2 Files (*.py2)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="541"/> - <source>Python2 GUI Files (*.pyw2)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="125"/> - <source>Python2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="127"/> - <source>Python3</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="148"/> - <source>Matlab</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="148"/> - <source>Octave</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="480"/> - <source>Matlab Files (*.m *.m.matlab)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="685"/> - <source>Matlab Files (*.m)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="685"/> - <source>Octave Files (*.m.octave)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="480"/> - <source>Octave Files (*.m *.m.octave)</source> + <source>Fortran Files (*.f95)</source> + <translation>Fichiers Fortran (*.f95)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="688"/> + <source>Fortran77 Files (*.f)</source> + <translation>Fichiers Fortran77 (*.f)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="691"/> + <source>Pascal Files (*.pas)</source> + <translation>Fichiers Pascal (*.pas)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="697"/> + <source>YAML Files (*.yml)</source> + <translation>Fichiers YAML (*.yml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="175"/> + <source>Pygments</source> + <translation>Pygments</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="375"/> + <source>Python Files (*.py *.py2 *.py3)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="378"/> + <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="556"/> + <source>Python3 Files (*.py)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="562"/> + <source>Python3 GUI Files (*.pyw)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="553"/> + <source>Python2 Files (*.py2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="559"/> + <source>Python2 GUI Files (*.pyw2)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="129"/> + <source>Python2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="131"/> + <source>Python3</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="115"/> + <source>Matlab</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="117"/> + <source>Octave</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="487"/> + <source>Matlab Files (*.m *.m.matlab)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="700"/> + <source>Matlab Files (*.m)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="703"/> + <source>Octave Files (*.m.octave)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="490"/> + <source>Octave Files (*.m *.m.octave)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="133"/> <source>QSS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="157"/> + <location filename="../QScintilla/Lexers/__init__.py" line="153"/> <source>Gettext</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="695"/> + <location filename="../QScintilla/Lexers/__init__.py" line="709"/> <source>Gettext Files (*.po)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="162"/> + <location filename="../QScintilla/Lexers/__init__.py" line="158"/> <source>CoffeeScript</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="702"/> + <location filename="../QScintilla/Lexers/__init__.py" line="716"/> <source>CoffeeScript Files (*.coffee)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="163"/> + <source>JSON</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="723"/> + <source>JSON Files (*.json)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="166"/> + <source>Markdown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="728"/> + <source>Markdown Files (*.md)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>LfConvertDataDialog</name> @@ -35671,6 +35947,19 @@ </message> </context> <context> + <name>MarkdownProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/MarkdownProvider.py" line="383"/> + <source>Create List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/MarkdownProvider.py" line="383"/> + <source>Enter desired number of list elements:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>MasterPasswordEntryDialog</name> <message> <location filename="../Preferences/ConfigurationPages/MasterPasswordEntryDialog.ui" line="14"/> @@ -35746,12 +36035,12 @@ <context> <name>McCabeChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="423"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="426"/> <source>'{0}' is too complex ({1})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="425"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="428"/> <source>{0}: {1}</source> <translation type="unfinished"></translation> </message> @@ -35779,124 +36068,109 @@ <translation type="unfinished">Entrer le nombre de messages log à afficher</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="155"/> <source>Commit</source> <translation type="unfinished">Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="161"/> <source>No. of commit messages to remember:</source> <translation type="unfinished">Nb. de messages de commit à conserver:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="168"/> <source>Enter the number of commit messages to remember</source> <translation type="unfinished">Entrer le nombre de messages de commit à conserver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="216"/> - <source>Incoming / Outgoing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="222"/> - <source>Select to show the incoming and outgoing log in a log browser dialog</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="225"/> - <source>Use Log Browser for incoming / outgoing log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="235"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="242"/> + <source>Select to update the working directory to new tip</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="236"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="241"/> - <source>Select to update the working directory to new tip</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="245"/> <source>Update after pulling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="334"/> <source>Edit the Mercurial configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="337"/> <source>Edit configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="311"/> <source>Cleanup</source> <translation type="unfinished">Nettoyer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="317"/> <source>Pattern:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="324"/> <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="252"/> <source>Select to prefer unbundle over pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="255"/> <source><b>Prefer Unbundle</b> <p>If this option is selected, it will be checked, if a Mercurial changegroups file from a previous "Show Incoming" request exists. In this case it will be applied and deleted. Otherwise a pull request will be sent.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="259"/> <source>Prefer Unbundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="292"/> <source>Revert</source> <translation type="unfinished">Recouvrir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="298"/> <source>Select to create a backup file (.orig) before reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="301"/> <source>Create Backup Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="269"/> <source>Merge</source> <translation type="unfinished">Fusionner</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="275"/> <source>Select to enforce usage of the Mercural internal merge tool</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="278"/> <source><b>Internal Merge Tool</b> <p>Select to enforce usage of the Mercural internal merge tool,which leaves conflict markers in the file in case of conflicting changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="282"/> <source>Use internal merge with conflict markers</source> <translation type="unfinished"></translation> </message> @@ -35931,15 +36205,25 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="197"/> <source>No. of commit authors to remember:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="204"/> <source>Enter the number of commit authors to remember</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="132"/> + <source>No. of message characters shown in list:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="139"/> + <source>Enter the number of characters of the commit message to be shown in the list</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -36898,107 +37182,107 @@ <context> <name>MiscellaneousChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="429"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="432"/> <source>coding magic comment not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="432"/> - <source>unknown encoding ({0}) found in coding magic comment</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="435"/> - <source>copyright notice not present</source> + <source>unknown encoding ({0}) found in coding magic comment</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="438"/> - <source>copyright notice contains invalid author</source> + <source>copyright notice not present</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="441"/> - <source>blind except: statement</source> + <source>copyright notice contains invalid author</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="444"/> - <source>found {0} formatter</source> + <source>blind except: statement</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="447"/> - <source>format string does contain unindexed parameters</source> + <source>found {0} formatter</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="450"/> - <source>docstring does contain unindexed parameters</source> + <source>format string does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="453"/> - <source>other string does contain unindexed parameters</source> + <source>docstring does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="456"/> - <source>format call uses too large index ({0})</source> + <source>other string does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="459"/> - <source>format call uses missing keyword ({0})</source> + <source>format call uses too large index ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="462"/> - <source>format call uses keyword arguments but no named entries</source> + <source>format call uses missing keyword ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="465"/> - <source>format call uses variable arguments but no numbered entries</source> + <source>format call uses keyword arguments but no named entries</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="468"/> - <source>format call uses implicit and explicit indexes together</source> + <source>format call uses variable arguments but no numbered entries</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="471"/> - <source>format call provides unused index ({0})</source> + <source>format call uses implicit and explicit indexes together</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="474"/> - <source>format call provides unused keyword ({0})</source> + <source>format call provides unused index ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="477"/> - <source>expected these __future__ imports: {0}; but only got: {1}</source> + <source>format call provides unused keyword ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="480"/> - <source>expected these __future__ imports: {0}; but got none</source> + <source>expected these __future__ imports: {0}; but only got: {1}</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="483"/> - <source>print statement found</source> + <source>expected these __future__ imports: {0}; but got none</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="486"/> - <source>one element tuple found</source> + <source>print statement found</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="489"/> + <source>one element tuple found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="492"/> <source>{0}: {1}</source> <translation type="unfinished"></translation> </message> @@ -37391,72 +37675,72 @@ <context> <name>NamingStyleChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="378"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> <source>class names should use CapWords convention</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> - <source>function name should be lowercase</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="384"/> - <source>argument name should be lowercase</source> + <source>function name should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="387"/> - <source>first argument of a class method should be named 'cls'</source> + <source>argument name should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="390"/> - <source>first argument of a method should be named 'self'</source> + <source>first argument of a class method should be named 'cls'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="393"/> + <source>first argument of a method should be named 'self'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="396"/> <source>first argument of a static method should not be named 'self' or 'cls</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="397"/> - <source>module names should be lowercase</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="400"/> - <source>package names should be lowercase</source> + <source>module names should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="403"/> - <source>constant imported as non constant</source> + <source>package names should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="406"/> - <source>lowercase imported as non lowercase</source> + <source>constant imported as non constant</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="409"/> - <source>camelcase imported as lowercase</source> + <source>lowercase imported as non lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="412"/> - <source>camelcase imported as constant</source> + <source>camelcase imported as lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="415"/> - <source>variable in function should be lowercase</source> + <source>camelcase imported as constant</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="418"/> + <source>variable in function should be lowercase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="421"/> <source>names 'l', 'O' and 'I' should be avoided</source> <translation type="unfinished"></translation> </message> @@ -39859,27 +40143,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1525"/> + <location filename="../Preferences/__init__.py" line="1530"/> <source>Export Preferences</source> <translation>Export des préférences</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1553"/> + <location filename="../Preferences/__init__.py" line="1558"/> <source>Import Preferences</source> <translation>Import des préférences</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1553"/> + <location filename="../Preferences/__init__.py" line="1558"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1655"/> + <location filename="../Preferences/__init__.py" line="1660"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1655"/> + <location filename="../Preferences/__init__.py" line="1660"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -39905,7 +40189,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="572"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="565"/> <source><p>ReStructuredText preview requires the <b>python-docutils</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pypi.python.org/pypi/docutils">this page.</a></p></source> <translation type="unfinished"></translation> </message> @@ -39915,8 +40199,8 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="597"/> - <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> + <location filename="../UI/Previewers/PreviewerHTML.py" line="590"/> + <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> <translation type="unfinished"></translation> </message> </context> @@ -39943,17 +40227,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="177"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="179"/> <source><p>No preview available for this type of file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="225"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="230"/> <source>Preview - {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="227"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="232"/> <source>Preview</source> <translation type="unfinished">Aperçu</translation> </message> @@ -44565,521 +44849,506 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/> - <source>Show log</source> - <translation type="unfinished">Afficher le log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/> - <source>Show &log</source> - <translation type="unfinished">Afficher le &log</translation> + <source>Show log browser</source> + <translation type="unfinished">Afficher le navigateur de logs</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> - <source>Show the log of the local project</source> - <translation type="unfinished">Affiche le log du projet local</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation type="unfinished">Affiche une fenêtre permettant de parcourir les logs du projet local</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="107"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation type="unfinished"><b>Afficher le log</b><p>Affiche le log du projet local</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="114"/> - <source>Show log browser</source> - <translation type="unfinished">Afficher le navigateur de logs</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="119"/> - <source>Show a dialog to browse the log of the local project</source> - <translation type="unfinished">Affiche une fenêtre permettant de parcourir les logs du projet local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/> + <translation type="obsolete"><b>Afficher le log</b><p>Affiche le log du projet local</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="107"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"><b>Navigateur de logs</b><p>Affiche une fenêtre permettant de parcourir les messages logs du projet local. La fenêtre n'affiche qu'un nombre limité d'entrées, mais un bouton permet d'afficher les logs plus anciens.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/> <source>Show &difference</source> <translation type="unfinished">Afficher les &différences</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished">Affiche les différences entre le projet local et le référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="132"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="137"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished">Affiche les différences entre le référentiel et les différentes révisions du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="140"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/> <source>Show differences (URLs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="153"/> <source>Show the difference of the project between two repository URLs</source> <translation type="unfinished">Affiche les différence du projet entre deux référentiels (URLs)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="156"/> <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/> + <source>Show status</source> + <translation type="unfinished">Afficher l'état (status)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/> + <source>Show &status</source> + <translation type="unfinished">Affich&er l'état VCS</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> + <source>Show the status of the local project</source> + <translation type="unfinished">Affiche l'état du projet local par rapport au référentiel VCS</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="172"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished"><b>Afficher l'état VCS</b><p>Affiche l'état du projet local par rapport au référentiel VCS.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> - <source>Show status</source> - <translation type="unfinished">Afficher l'état (status)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> - <source>Show &status</source> - <translation type="unfinished">Affich&er l'état VCS</translation> + <source>Show change lists</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/> - <source>Show the status of the local project</source> - <translation type="unfinished">Affiche l'état du projet local par rapport au référentiel VCS</translation> + <source>Show the change lists and associated files of the local project</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="187"/> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation type="unfinished"><b>Afficher l'état VCS</b><p>Affiche l'état du projet local par rapport au référentiel VCS.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> - <source>Show change lists</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="199"/> - <source>Show the change lists and associated files of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="202"/> <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> <source>Show repository info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="215"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="200"/> <source>Show some repository related information for the local project</source> <translation type="unfinished">Affiche les informations du référentiel en rapport avec le projet local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="203"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation type="unfinished"><b>Afficher les infos du référentiel</b><p>Affiche les informations du référentiel en rapport avec le projet local.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source>Tag in repository</source> + <translation type="unfinished">Etiqueter au niveau du référentiel (tag)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source>&Tag in repository...</source> + <translation type="unfinished">&Etiqueter dans le référentiel...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="216"/> + <source>Tag the local project in the repository</source> + <translation type="unfinished">Etiquette le projet local dans le référentiel</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"><b>Etiqueter dans le référentiel</b><p>Etiquette le projet local dans le référentiel (opération "tag").</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> - <source>Tag in repository</source> - <translation type="unfinished">Etiqueter au niveau du référentiel (tag)</translation> + <source>Export from repository</source> + <translation type="unfinished">Exporter du référentiel</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> - <source>&Tag in repository...</source> - <translation type="unfinished">&Etiqueter dans le référentiel...</translation> + <source>&Export from repository...</source> + <translation type="unfinished">&Exporter du référentiel...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="231"/> - <source>Tag the local project in the repository</source> - <translation type="unfinished">Etiquette le projet local dans le référentiel</translation> + <source>Export a project from the repository</source> + <translation type="unfinished">Exporte un projet d'un référentiel VCS</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished"><b>Etiqueter dans le référentiel</b><p>Etiquette le projet local dans le référentiel (opération "tag").</p></translation> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation type="unfinished"><b>Exporter du référentiel</b><p>Exporte un projet d'un référentiel VCS.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> - <source>Export from repository</source> - <translation type="unfinished">Exporter du référentiel</translation> + <source>Command options</source> + <translation type="unfinished">Options de commande</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> - <source>&Export from repository...</source> - <translation type="unfinished">&Exporter du référentiel...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="246"/> - <source>Export a project from the repository</source> - <translation type="unfinished">Exporte un projet d'un référentiel VCS</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation type="unfinished"><b>Exporter du référentiel</b><p>Exporte un projet d'un référentiel VCS.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/> - <source>Command options</source> - <translation type="unfinished">Options de commande</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/> <source>Command &options...</source> <translation type="unfinished">&Options de commande...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Show the VCS command options</source> <translation type="unfinished">Affiche les options de commandes VCS</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation type="unfinished"><b>Options de commandes...</b><p>Affiche une boite de dialogue pour éditer les options de commandes VCS</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/> + <source>Revert changes</source> + <translation type="unfinished">Revenir avant les modifications</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/> + <source>Re&vert changes</source> + <translation type="unfinished">&Recharger le projet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <source>Revert all changes made to the local project</source> + <translation type="unfinished">Recharger le projet et écraser toutes les modifications locales</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation type="unfinished"><b>Options de commandes...</b><p>Affiche une boite de dialogue pour éditer les options de commandes VCS</p></translation> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation type="unfinished"><b>Recharger le projet</b><p>Recharge le projet et écrase toutes les modifications effectuées localement.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/> - <source>Revert changes</source> - <translation type="unfinished">Revenir avant les modifications</translation> + <source>Merge</source> + <translation type="unfinished">Fusionner</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/> - <source>Re&vert changes</source> - <translation type="unfinished">&Recharger le projet</translation> + <source>Mer&ge changes...</source> + <translation type="unfinished">&Fusionner les modifications...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> - <source>Revert all changes made to the local project</source> - <translation type="unfinished">Recharger le projet et écraser toutes les modifications locales</translation> + <source>Merge changes of a tag/revision into the local project</source> + <translation type="unfinished">Fusionner les modifications d'une révision avec le projet local</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation type="unfinished"><b>Recharger le projet</b><p>Recharge le projet et écrase toutes les modifications effectuées localement.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/> - <source>Merge</source> - <translation type="unfinished">Fusionner</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/> - <source>Mer&ge changes...</source> - <translation type="unfinished">&Fusionner les modifications...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="289"/> - <source>Merge changes of a tag/revision into the local project</source> - <translation type="unfinished">Fusionner les modifications d'une révision avec le projet local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation type="unfinished"><b>Fusionner</b><p>Fusionner les modifications d'une révision avec le projet local</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/> + <source>Switch</source> + <translation type="unfinished">Basculer de version</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/> + <source>S&witch...</source> + <translation type="unfinished">&Basculer de version...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <source>Switch the local copy to another tag/branch</source> + <translation type="unfinished">Bascule de la copie locale vers une autre branche/étiquette</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> + <translation type="unfinished"><b>Basculer de version</b><p>Bascule de la copie locale vers une autre branche/étiquette.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>Switch</source> - <translation type="unfinished">Basculer de version</translation> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>S&witch...</source> - <translation type="unfinished">&Basculer de version...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> - <source>Switch the local copy to another tag/branch</source> - <translation type="unfinished">Bascule de la copie locale vers une autre branche/étiquette</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> - <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> - <translation type="unfinished"><b>Basculer de version</b><p>Bascule de la copie locale vers une autre branche/étiquette.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> - <source>Conflicts resolved</source> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="304"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="307"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> + <source>Cleanup</source> + <translation type="unfinished">Nettoyer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> + <source>Cleanu&p</source> + <translation type="unfinished">&Nettoyer</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished"></translation> + <source>Cleanup the local project</source> + <translation type="unfinished">Nettoyer le projet local</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="322"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/> - <source>Cleanup</source> - <translation type="unfinished">Nettoyer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/> - <source>Cleanu&p</source> - <translation type="unfinished">&Nettoyer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> - <source>Cleanup the local project</source> - <translation type="unfinished">Nettoyer le projet local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="337"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation type="unfinished"><b>Nettoyer</b><p>Permet de nettoyer le projet local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>Execute command</source> <translation type="unfinished">Exécuter une commande</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>E&xecute command...</source> <translation type="unfinished">E&xécuter une commande...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="333"/> <source>Execute an arbitrary VCS command</source> <translation type="unfinished">Exécuter une commande VCS arbitraire</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="336"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation type="unfinished"><b>Exécuter une commande</b><p>Ouvre une boite de dialogue pour exécuter une commande VCS arbitraire.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/> <source>List tags</source> <translation type="unfinished">Lister les étiquettes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/> <source>List tags...</source> <translation type="unfinished">Lister les étiquettes...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> <source>List tags of the project</source> <translation type="unfinished">Liste les étiquettes du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="350"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"><b>Liste des étiquettes</b><p>Liste les étiquettes du projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches</source> <translation type="unfinished">Lister les branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches...</source> <translation type="unfinished">Lister les branches...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="361"/> <source>List branches of the project</source> <translation type="unfinished">Liste les branches du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="364"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation type="unfinished"><b>Liste des branches</b><p>Effectue la liste de toutes les branches de développement du projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source>List repository contents</source> <translation type="unfinished">Listing du référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source>List repository contents...</source> <translation type="unfinished">Listing du référentiel...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="375"/> <source>Lists the contents of the repository</source> <translation type="unfinished">Liste le contenu du référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation type="unfinished"><b>Listing du référentiel</b><p>Cette liste affiche le contenu du référentiel.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/> <source>Set Property</source> <translation type="unfinished">Définir une propriété</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/> <source>Set Property...</source> <translation type="unfinished">Définir une propriété...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="389"/> <source>Set a property for the project files</source> <translation type="unfinished">Définit une propriété pour les fichiers projets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="392"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation type="unfinished"><b>Propriétés</b><p>Définition des propritétés du projet</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source>List Properties</source> <translation type="unfinished">Lister les propriétés</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source>List Properties...</source> <translation type="unfinished">Lister les propriétés...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="403"/> <source>List properties of the project files</source> <translation type="unfinished">Liste des propriétés des fichiers projets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation type="unfinished"><b>Liste des proprtiétés</b><p>Liste des propriétés des fichiers projets.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/> <source>Delete Property</source> <translation type="unfinished">Supprimer une propriété</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/> <source>Delete Property...</source> <translation type="unfinished">Supprimer une propriété...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> + <source>Delete a property for the project files</source> + <translation type="unfinished">Suppression d'une propriété pour les fichiers projets</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="420"/> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation type="unfinished"><b>Supprimer une propriété</b><p>Supprime une propriété des fichiers projets.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/> + <source>Relocate</source> + <translation type="unfinished">Déplacer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/> + <source>Relocate...</source> + <translation type="unfinished">Déplacer...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> - <source>Delete a property for the project files</source> - <translation type="unfinished">Suppression d'une propriété pour les fichiers projets</translation> + <source>Relocate the working copy to a new repository URL</source> + <translation type="unfinished">Recopie une copie de travail vers une nouvelle URL de référentiel</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation type="unfinished"><b>Supprimer une propriété</b><p>Supprime une propriété des fichiers projets.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/> - <source>Relocate</source> - <translation type="unfinished">Déplacer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/> - <source>Relocate...</source> - <translation type="unfinished">Déplacer...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> - <source>Relocate the working copy to a new repository URL</source> - <translation type="unfinished">Recopie une copie de travail vers une nouvelle URL de référentiel</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation type="unfinished"><b>Relocaliser</b><p>Redéfinit une URL de référentiel pour la copie courante.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/> + <source>Repository Browser</source> + <translation type="unfinished">Navigateur de référentiel</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/> + <source>Repository Browser...</source> + <translation type="unfinished">Navigateur de référentiel...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> + <source>Show the Repository Browser dialog</source> + <translation type="unfinished">Affiche la fenêtre de navigation du référentiel</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation type="unfinished"><b>Navigateur de référentiel</b><p>Affiche la fenêtre de navigation du référentiel.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> - <source>Repository Browser</source> - <translation type="unfinished">Navigateur de référentiel</translation> + <source>Configure</source> + <translation type="unfinished">Configuration</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> - <source>Repository Browser...</source> - <translation type="unfinished">Navigateur de référentiel...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="463"/> - <source>Show the Repository Browser dialog</source> - <translation type="unfinished">Affiche la fenêtre de navigation du référentiel</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="466"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation type="unfinished"><b>Navigateur de référentiel</b><p>Affiche la fenêtre de navigation du référentiel.</p></translation> + <source>Configure...</source> + <translation type="unfinished">Configuration...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="462"/> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation type="unfinished">Afficher la page de configuration avec la page Subversion sélectionnée</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="465"/> + <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> + <translation type="unfinished"><b>Configuration</b><p>Affiche la page de configuration avec la page Subversion sélectionnée.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/> - <source>Configure</source> - <translation type="unfinished">Configuration</translation> + <source>Upgrade</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/> - <source>Configure...</source> - <translation type="unfinished">Configuration...</translation> + <source>Upgrade...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="477"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation type="unfinished">Afficher la page de configuration avec la page Subversion sélectionnée</translation> + <source>Upgrade the working copy to the current format</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="480"/> - <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> - <translation type="unfinished"><b>Configuration</b><p>Affiche la page de configuration avec la page Subversion sélectionnée.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/> - <source>Upgrade</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/> - <source>Upgrade...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="492"/> - <source>Upgrade the working copy to the current format</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="495"/> <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="559"/> <source>Subversion (pysvn)</source> <translation type="unfinished">Subversion (pysvn)</translation> </message> @@ -48142,12 +48411,12 @@ <translation type="unfinished">Ajouter...</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="58"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="68"/> <source>Remove</source> <translation type="unfinished">Supprimer</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="117"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="132"/> <source>Add Documentation</source> <translation type="unfinished"></translation> </message> @@ -48157,7 +48426,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="152"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="167"/> <source>Remove Documentation</source> <translation type="unfinished"></translation> </message> @@ -48167,40 +48436,50 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="55"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="65"/> <source>Press to remove the selected documents from the database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="137"/> - <source>Do you really want to remove the selected documentation sets from the database?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="107"/> - <source>The file <b>{0}</b> is not a valid Qt Help File.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="117"/> - <source>The namespace <b>{0}</b> is already registered.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="152"/> + <source>Do you really want to remove the selected documentation sets from the database?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="122"/> + <source>The file <b>{0}</b> is not a valid Qt Help File.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="132"/> + <source>The namespace <b>{0}</b> is already registered.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="167"/> <source>Some documents currently opened reference the documentation you are attempting to remove. Removing the documentation will close those documents. Remove anyway?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="78"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="55"/> <source>Press to select QtHelp documents provided by a plug-in to add to the database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="81"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="58"/> <source>Add from Plug-ins...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="85"/> + <source>Select to manage the plug-in provided documentation sets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="88"/> + <source>Manage Plug-ins...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QtHelpDocumentationSelectionDialog</name> @@ -48214,6 +48493,61 @@ <source>Select the documentation files to be installed:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="144"/> + <source>Delete Documentation Sets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="91"/> + <source>Shall the selected documentation sets really be deleted?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="107"/> + <source><p>The documentation set <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="126"/> + <source>Shall the selected documentation set categories really be deleted?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="144"/> + <source>Shall all documentation sets really be deleted?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="56"/> + <source>Press to delete the selected documentation sets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="59"/> + <source>Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="66"/> + <source>Press to delete the selected category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="69"/> + <source>Delete Categories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="76"/> + <source>Press to delete all entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="79"/> + <source>Delete All</source> + <translation type="unfinished">Tous supprimer</translation> + </message> </context> <context> <name>QtHelpFiltersDialog</name> @@ -49486,6 +49820,19 @@ </message> </context> <context> + <name>RestructuredTextProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/RestructuredTextProvider.py" line="411"/> + <source>Create List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/RestructuredTextProvider.py" line="411"/> + <source>Enter desired number of list elements:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>SafariImporter</name> <message> <location filename="../WebBrowser/Bookmarks/BookmarksImporters/SafariImporter.py" line="44"/> @@ -52615,52 +52962,52 @@ <translation>Exporter un projet du référentiel Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/> <source>Subversion Error</source> <translation>Erreur Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="951"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>Impossible d'atteindre l'URL du référentiel à partir de la copie locale. Abandon de l'opération d'étiquetage</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="998"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="978"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>Le format de l'URL du référentiel n'est pas valide. Abandon de l'opération d'étiquetage</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1093"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1073"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>Impossible d'atteindre l'URL du référentiel du projet depuis la copie locale. Abandon de l'opération</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>Le format de l'URL du référentiel n'est pas valide. Abandon de l'opération</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1512"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1492"/> <source>Subversion command</source> <translation>Commande Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1779"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1759"/> <source>Subversion Set Property</source> <translation>Propriété Subversion</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1781"/> + <source>You have to supply a property name. Aborting.</source> + <translation>Vous devez donner un nom à la propriété. Abandon.</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1801"/> - <source>You have to supply a property name. Aborting.</source> - <translation>Vous devez donner un nom à la propriété. Abandon.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1821"/> <source>Subversion Delete Property</source> <translation>Suppression d'une propriété Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1791"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1771"/> <source>Enter property name</source> <translation>Entrer le nom de la propriété</translation> </message> @@ -52690,12 +53037,12 @@ <translation>Supprimer des fichiers/répertoires du réferentiel Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1056"/> <source>Reverting changes</source> <translation>Revenir avant les modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1684"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1664"/> <source>Resolving conficts</source> <translation>Résoudre les confits</translation> </message> @@ -52722,45 +53069,45 @@ <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> <source>Subversion Log</source> - <translation>Log Subversion</translation> + <translation type="obsolete">Log Subversion</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> <source>Select number of entries to show.</source> - <translation>Sélectionner plusieurs entrées à afficher.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2100"/> + <translation type="obsolete">Sélectionner plusieurs entrées à afficher.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2080"/> <source>Locking in the Subversion repository</source> <translation>Verrouillage dans le référentiel Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2108"/> <source>Unlocking in the Subversion repository</source> <translation>Déverrouillage dans le référentiel Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1923"/> <source>Property set.</source> <translation>Propriété définie.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1997"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1976"/> <source>Property deleted.</source> <translation>Propriété supprimée.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/> <source>Subversion Lock</source> <translation>Verrou Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/> <source>Enter lock comment</source> <translation>Entrer un commentaire pour le verrou</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2153"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2133"/> <source>Relocating</source> <translation>Déplacement</translation> </message> @@ -52915,7 +53262,7 @@ <translation>sans version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1984"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1964"/> <source>The svn process did not finish within 30s.</source> <translation>Le processus SVN ne s'est pas terminé dans les 30 dernières secondes.</translation> </message> @@ -52925,27 +53272,27 @@ <translation>Impossible de lancer l'executable SVN.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/> <source>Repository Browser</source> <translation>Navigateur de référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/> <source>Enter the repository URL.</source> <translation>Entrer l'URL du référentiel.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2221"/> <source>Remove from changelist</source> <translation>Supprimer de la liste des modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/> <source>Add to changelist</source> <translation>Ajouter à la liste des modifications:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/> <source>Enter name of the changelist:</source> <translation>Entrer le nom de la liste des modifications:</translation> </message> @@ -52975,27 +53322,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1033"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1013"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1151"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1131"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1196"/> <source>Merging {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1482"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1462"/> <source>Cleaning up {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1695"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -53011,7 +53358,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1255"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1234"/> <source>Revision {0}. </source> <translation type="unfinished"></translation> @@ -53027,37 +53374,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/> <source>Revert changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1042"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1987"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1967"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/> <source>Subversion Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2305"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2285"/> <source>Upgrade</source> <translation type="unfinished"></translation> </message> @@ -53935,12 +54282,12 @@ <translation>Log Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="661"/> <source>Revision</source> <translation>Révision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="658"/> <source>Author</source> <translation>Auteur</translation> </message> @@ -53950,7 +54297,7 @@ <translation>Date</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="165"/> <source>Message</source> <translation>Message</translation> </message> @@ -53990,97 +54337,97 @@ <translation>Entrer le nombre de messages max à rechercher</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="261"/> <source>Press to generate a diff to the previous revision</source> <translation>Cliquer pour générer un diff par rapport à la version précédente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="264"/> <source>&Diff to Previous</source> <translation>&Diff vs précédent</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="271"/> <source>Press to compare two revisions</source> <translation>Cliquer pour comparer deux versions</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> <source>&Compare Revisions</source> <translation>&Comparer des versions</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="312"/> <source>Errors</source> <translation>Erreurs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="318"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> <translation><b>Erreurs de la commande Subversion log</b><p>Affiche les messages d'erreurs de la commande svn log.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="334"/> <source>Input</source> <translation>Entrée</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="336"/> - <source>Press to send the input to the subversion process</source> - <translation>Cliquer pour envoyer l'entrée saisie au processus Subversion</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/> - <source>&Send</source> - <translation>&Envoyer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/> - <source>Alt+S</source> - <translation>Alt+E</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="349"/> - <source>Enter data to be sent to the subversion process</source> - <translation>Entrer les données à envoyer au processus Subversion</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> - <source>Select to switch the input field to password mode</source> - <translation>Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> + <source>Press to send the input to the subversion process</source> + <translation>Cliquer pour envoyer l'entrée saisie au processus Subversion</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> - <source>&Password Mode</source> - <translation>Mode Mot de &Passe</translation> + <source>&Send</source> + <translation>&Envoyer</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> + <source>Alt+S</source> + <translation>Alt+E</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="369"/> + <source>Enter data to be sent to the subversion process</source> + <translation>Entrer les données à envoyer au processus Subversion</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="376"/> + <source>Select to switch the input field to password mode</source> + <translation>Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="379"/> + <source>&Password Mode</source> + <translation>Mode Mot de &Passe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="382"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="89"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="93"/> <source>Added</source> <translation>Ajouté</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="90"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="94"/> <source>Deleted</source> <translation>Effacer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="91"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="95"/> <source>Modified</source> <translation>Modifié</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="504"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="527"/> <source>Subversion Error</source> <translation>Erreur Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="313"/> <source>Process Generation Error</source> <translation>Erreur du processus</translation> </message> @@ -54125,159 +54472,137 @@ <translation>Arrêt lors de copie/déplacement</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="313"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="96"/> <source>Replaced</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="294"/> <source>Select to show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="297"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnLogDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="81"/> <source>Added</source> - <translation>Ajouté</translation> + <translation type="obsolete">Ajouté</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="82"/> <source>Deleted</source> - <translation>Effacer</translation> + <translation type="obsolete">Effacer</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="83"/> <source>Modified</source> - <translation>Modifié</translation> + <translation type="obsolete">Modifié</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="87"/> <source>revision</source> - <translation>révision</translation> + <translation type="obsolete">révision</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="14"/> <source>Subversion Log</source> - <translation>Log Subversion</translation> + <translation type="obsolete">Log Subversion</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="26"/> <source>Log</source> - <translation>Log</translation> + <translation type="obsolete">Log</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="32"/> <source><b>Subversion Log</b><p>This shows the output of the svn log command. By clicking on the links you may show the difference between versions.</p></source> - <translation><b>Log Subversion</b><p>Affiche les messages de la commande svn log. En cliquant sur les liens, vous pouvez visualiser les différences entre les différentes versions.</p></translation> + <translation type="obsolete"><b>Log Subversion</b><p>Affiche les messages de la commande svn log. En cliquant sur les liens, vous pouvez visualiser les différences entre les différentes versions.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="58"/> <source>Errors</source> - <translation>Erreurs</translation> + <translation type="obsolete">Erreurs</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="64"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> - <translation><b>Erreurs de la commande Subversion log</b><p>Affiche les messages d'erreurs de la commande subversion log.</p></translation> + <translation type="obsolete"><b>Erreurs de la commande Subversion log</b><p>Affiche les messages d'erreurs de la commande subversion log.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="80"/> <source>Input</source> - <translation>Entrée</translation> + <translation type="obsolete">Entrée</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="102"/> <source>Press to send the input to the subversion process</source> - <translation>Cliquer pour envoyer l'entrée saisie au processus Subversion</translation> + <translation type="obsolete">Cliquer pour envoyer l'entrée saisie au processus Subversion</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="105"/> <source>&Send</source> - <translation>&Envoyer</translation> + <translation type="obsolete">&Envoyer</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="108"/> <source>Alt+S</source> - <translation>Alt+E</translation> + <translation type="obsolete">Alt+E</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="115"/> <source>Enter data to be sent to the subversion process</source> - <translation>Entrer les données à envoyer au processus Subversion</translation> + <translation type="obsolete">Entrer les données à envoyer au processus Subversion</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="122"/> <source>Select to switch the input field to password mode</source> - <translation>Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> + <translation type="obsolete">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="125"/> <source>&Password Mode</source> - <translation>Mode Mot de &Passe</translation> + <translation type="obsolete">Mode Mot de &Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="128"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> <source>Process Generation Error</source> - <translation>Erreur du processus</translation> + <translation type="obsolete">Erreur du processus</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="55"/> <source><b>Processing your request, please wait...</b></source> - <translation><b>Votre requête est en cours d'execution, merci de patienter...</b></translation> + <translation type="obsolete"><b>Votre requête est en cours d'execution, merci de patienter...</b></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="193"/> - <source>diff to {0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="202"/> - <source><i>author: {0}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="205"/> - <source><i>date: {0}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="191"/> - <source> (copied from {0}, revision {1})</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="42"/> - <source>Select to show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="45"/> - <source>Show differences side-by-side</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> </context> <context> @@ -54597,177 +54922,177 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="654"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="646"/> <source>Update from repository</source> <translation>Mettre à jour à partir du référentiel (update)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="658"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="650"/> <source>Commit changes to repository...</source> <translation>Appliquer des changements dans le référentiel. (commit)...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="656"/> <source>Add to repository</source> <translation>Ajouter au référentiel (add)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="385"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="381"/> <source>Add tree to repository</source> <translation>Ajouter l'arborescence au référentiel (add)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="660"/> <source>Remove from repository (and disk)</source> <translation>Supprimer du référentiel (et du disque)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="566"/> <source>Show log</source> - <translation>Afficher le log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="684"/> + <translation type="obsolete">Afficher le log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="676"/> <source>Show status</source> <translation>Afficher l'état (status)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="696"/> <source>Revert changes</source> <translation>Revenir avant les modifications</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="700"/> + <source>Merge changes</source> + <translation>Fusionner les modifications</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="708"/> - <source>Merge changes</source> - <translation>Fusionner les modifications</translation> + <source>Set Property</source> + <translation>Définir une propriété</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="710"/> + <source>List Properties</source> + <translation>Lister les propriétés</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="713"/> + <source>Delete Property</source> + <translation>Supprimer une propriété</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="716"/> - <source>Set Property</source> - <translation>Définir une propriété</translation> + <source>Select all local file entries</source> + <translation>Sélectionner tous les fichiers locaux</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="718"/> - <source>List Properties</source> - <translation>Lister les propriétés</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="721"/> - <source>Delete Property</source> - <translation>Supprimer une propriété</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="724"/> - <source>Select all local file entries</source> - <translation>Sélectionner tous les fichiers locaux</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="726"/> <source>Select all versioned file entries</source> <translation>Sélectionner tous les fichiers ayant une version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="720"/> <source>Select all local directory entries</source> <translation>Sélectionner tous les répertoires locaux</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="730"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="722"/> <source>Select all versioned directory entries</source> <translation>Sélectionner tous les répertoires ayant une version</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="430"/> + <source>Lock</source> + <translation>Verrouiller</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="434"/> - <source>Lock</source> - <translation>Verrouiller</translation> + <source>Unlock</source> + <translation>Déverrouiller</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="438"/> - <source>Unlock</source> - <translation>Déverrouiller</translation> + <source>Break Lock</source> + <translation>Casser le verrouillage d'un autre utilisateur</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="442"/> - <source>Break Lock</source> - <translation>Casser le verrouillage d'un autre utilisateur</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="446"/> <source>Steal Lock</source> <translation>Voler le verrou</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="634"/> <source>Version Control</source> <translation>Contrôle de version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="286"/> <source>Show annotated file</source> <translation>Afficher les fichiers annotés</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="572"/> <source>Show repository info</source> <translation>Afficher les infos du référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="562"/> <source>Show log browser</source> <translation>Afficher le navigateur de logs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="733"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="725"/> <source>Configure...</source> <translation>Configuration...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="667"/> <source>Add to Changelist</source> <translation>Ajouter à la liste des modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="679"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="671"/> <source>Remove from Changelist</source> <translation>Supprimer de la liste des modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="547"/> <source>Copy</source> <translation type="unfinished">Copier</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="549"/> <source>Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="681"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="271"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="267"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="693"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="685"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="276"/> <source>Show differences side-by-side (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="698"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="690"/> <source>Show differences (URLs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="712"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> @@ -54836,336 +55161,331 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/> - <source>Show log</source> - <translation>Afficher le log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/> - <source>Show &log</source> - <translation>Afficher le &log</translation> + <source>Show log browser</source> + <translation>Afficher le navigateur de logs</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="104"/> - <source>Show the log of the local project</source> - <translation>Affiche le log du projet local</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation>Affiche une fenêtre permettant de parcourir les logs du projet local</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="107"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation><b>Afficher le log</b><p>Affiche le log du projet local</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="131"/> + <translation type="obsolete"><b>Afficher le log</b><p>Affiche le log du projet local</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/> <source>Show &difference</source> <translation>Afficher les &différences</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="121"/> <source>Show the difference of the local project to the repository</source> <translation>Affiche les différences entre le projet local et le référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="137"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Affiche les différences entre le référentiel et les différentes révisions du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="164"/> <source>Show status</source> <translation>Afficher l'état (status)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="164"/> <source>Show &status</source> <translation>Affich&er l'état VCS</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="169"/> <source>Show the status of the local project</source> <translation>Affiche l'état du projet local par rapport au référentiel VCS</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="172"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Afficher l'état VCS</b><p>Affiche l'état du projet local par rapport au référentiel VCS.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="195"/> + <source>Tag in repository</source> + <translation>Etiqueter au niveau du référentiel (tag)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="195"/> + <source>&Tag in repository...</source> + <translation>&Etiqueter dans le référentiel...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="200"/> + <source>Tag the local project in the repository</source> + <translation>Etiquette le projet local dans le référentiel</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="203"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Etiqueter dans le référentiel</b><p>Etiquette le projet local dans le référentiel (opération "tag").</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="210"/> - <source>Tag in repository</source> - <translation>Etiqueter au niveau du référentiel (tag)</translation> + <source>Export from repository</source> + <translation>Exporter du référentiel</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="210"/> - <source>&Tag in repository...</source> - <translation>&Etiqueter dans le référentiel...</translation> + <source>&Export from repository...</source> + <translation>&Exporter du référentiel...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="215"/> - <source>Tag the local project in the repository</source> - <translation>Etiquette le projet local dans le référentiel</translation> + <source>Export a project from the repository</source> + <translation>Exporte un projet d'un référentiel VCS</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="218"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Etiqueter dans le référentiel</b><p>Etiquette le projet local dans le référentiel (opération "tag").</p></translation> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>Exporter du référentiel</b><p>Exporte un projet d'un référentiel VCS.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/> - <source>Export from repository</source> - <translation>Exporter du référentiel</translation> + <source>Command options</source> + <translation>Options de commande</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/> - <source>&Export from repository...</source> - <translation>&Exporter du référentiel...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="230"/> - <source>Export a project from the repository</source> - <translation>Exporte un projet d'un référentiel VCS</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="233"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation><b>Exporter du référentiel</b><p>Exporte un projet d'un référentiel VCS.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="240"/> - <source>Command options</source> - <translation>Options de commande</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="240"/> <source>Command &options...</source> <translation>&Options de commande...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="229"/> <source>Show the VCS command options</source> <translation>Affiche les options de commandes VCS</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="231"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation><b>Options de commandes...</b><p>Affiche une boite de dialogue pour éditer les options de commandes VCS</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="238"/> + <source>Revert changes</source> + <translation>Revenir avant les modifications</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="238"/> + <source>Re&vert changes</source> + <translation>&Recharger le projet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="243"/> + <source>Revert all changes made to the local project</source> + <translation>Recharger le projet et écraser toutes les modifications locales</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="246"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation><b>Options de commandes...</b><p>Affiche une boite de dialogue pour éditer les options de commandes VCS</p></translation> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation><b>Recharger le projet</b><p>Recharge le projet et écrase toutes les modifications effectuées localement.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/> - <source>Revert changes</source> - <translation>Revenir avant les modifications</translation> + <source>Merge</source> + <translation>Fusionner</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/> - <source>Re&vert changes</source> - <translation>&Recharger le projet</translation> + <source>Mer&ge changes...</source> + <translation>&Fusionner les modifications...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="258"/> - <source>Revert all changes made to the local project</source> - <translation>Recharger le projet et écraser toutes les modifications locales</translation> + <source>Merge changes of a tag/revision into the local project</source> + <translation>Fusionner les modifications d'une révision avec le projet local</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="261"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation><b>Recharger le projet</b><p>Recharge le projet et écrase toutes les modifications effectuées localement.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="268"/> - <source>Merge</source> - <translation>Fusionner</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="268"/> - <source>Mer&ge changes...</source> - <translation>&Fusionner les modifications...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="273"/> - <source>Merge changes of a tag/revision into the local project</source> - <translation>Fusionner les modifications d'une révision avec le projet local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="276"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Fusionner</b><p>Fusionner les modifications d'une révision avec le projet local</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="269"/> <source>Switch</source> <translation>Basculer de version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="269"/> <source>S&witch...</source> <translation>&Basculer de version...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="274"/> <source>Switch the local copy to another tag/branch</source> <translation>Bascule de la copie locale vers une autre branche/étiquette</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="277"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>Basculer de version</b><p>Bascule de la copie locale vers une autre branche/étiquette.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> <source>Cleanup</source> <translation>Nettoyer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> <source>Cleanu&p</source> <translation>&Nettoyer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="303"/> <source>Cleanup the local project</source> <translation>Nettoyer le projet local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="306"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Nettoyer</b><p>Permet de nettoyer le projet local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="328"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="313"/> <source>Execute command</source> <translation>Exécuter une commande</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="328"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="313"/> <source>E&xecute command...</source> <translation>E&xécuter une commande...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="317"/> <source>Execute an arbitrary VCS command</source> <translation>Exécuter une commande VCS arbitraire</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="320"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation><b>Exécuter une commande</b><p>Ouvre une boite de dialogue pour exécuter une commande VCS arbitraire.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="327"/> <source>List tags</source> <translation>Lister les étiquettes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="327"/> <source>List tags...</source> <translation>Lister les étiquettes...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="331"/> <source>List tags of the project</source> <translation>Liste les étiquettes du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="334"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Liste des étiquettes</b><p>Liste les étiquettes du projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="341"/> <source>List branches</source> <translation>Lister les branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="341"/> <source>List branches...</source> <translation>Lister les branches...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="345"/> <source>List branches of the project</source> <translation>Liste les branches du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="348"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Liste des branches</b><p>Effectue la liste de toutes les branches de développement du projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="355"/> <source>List repository contents</source> <translation>Listing du référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="355"/> <source>List repository contents...</source> <translation>Listing du référentiel...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="374"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="359"/> <source>Lists the contents of the repository</source> <translation>Liste le contenu du référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="377"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="362"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation><b>Listing du référentiel</b><p>Cette liste affiche le contenu du référentiel.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="369"/> <source>Set Property</source> <translation>Définir une propriété</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="369"/> <source>Set Property...</source> <translation>Définir une propriété...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="373"/> <source>Set a property for the project files</source> <translation>Définit une propriété pour les fichiers projets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="376"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation><b>Propriétés</b><p>Définition des propritétés du projet</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="383"/> <source>List Properties</source> <translation>Lister les propriétés</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="383"/> <source>List Properties...</source> <translation>Lister les propriétés...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="387"/> <source>List properties of the project files</source> <translation>Liste des propriétés des fichiers projets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="390"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation><b>Liste des proprtiétés</b><p>Liste des propriétés des fichiers projets.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="397"/> <source>Delete Property</source> <translation>Supprimer une propriété</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="397"/> <source>Delete Property...</source> <translation>Supprimer une propriété...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="416"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="401"/> <source>Delete a property for the project files</source> <translation>Suppression d'une propriété pour les fichiers projets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="419"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="404"/> <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> <translation><b>Supprimer une propriété</b><p>Supprime une propriété des fichiers projets.</p></translation> </message> @@ -55180,22 +55500,22 @@ <translation type="obsolete">Affiche les informations du référentiel en rapport avec le projet local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="426"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/> <source>Relocate</source> <translation>Déplacer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="426"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/> <source>Relocate...</source> <translation>Déplacer...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="431"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="416"/> <source>Relocate the working copy to a new repository URL</source> <translation>Recopie une copie de travail vers une nouvelle URL de référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="434"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="419"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>Relocaliser</b><p>Redéfinit une URL de référentiel pour la copie courante.</p></translation> </message> @@ -55205,152 +55525,142 @@ <translation type="obsolete"><b>Afficher les infos du référentiel</b><p>Affiche les informations du référentiel en rapport avec le projet local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="153"/> <source>Show the difference of the project between two repository URLs</source> <translation>Affiche les différence du projet entre deux référentiels (URLs)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="114"/> - <source>Show log browser</source> - <translation>Afficher le navigateur de logs</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="119"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>Affiche une fenêtre permettant de parcourir les logs du projet local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="122"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="107"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Navigateur de logs</b><p>Affiche une fenêtre permettant de parcourir les messages logs du projet local. La fenêtre n'affiche qu'un nombre limité d'entrées, mais un bouton permet d'afficher les logs plus anciens.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="427"/> + <source>Repository Browser</source> + <translation>Navigateur de référentiel</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="427"/> + <source>Repository Browser...</source> + <translation>Navigateur de référentiel...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="432"/> + <source>Show the Repository Browser dialog</source> + <translation>Affiche la fenêtre de navigation du référentiel</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="435"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation><b>Navigateur de référentiel</b><p>Affiche la fenêtre de navigation du référentiel.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> - <source>Repository Browser</source> - <translation>Navigateur de référentiel</translation> + <source>Configure</source> + <translation>Configuration</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> - <source>Repository Browser...</source> - <translation>Navigateur de référentiel...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="447"/> - <source>Show the Repository Browser dialog</source> - <translation>Affiche la fenêtre de navigation du référentiel</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="450"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation><b>Navigateur de référentiel</b><p>Affiche la fenêtre de navigation du référentiel.</p></translation> + <source>Configure...</source> + <translation>Configuration...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="446"/> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation>Afficher la page de configuration avec la page Subversion sélectionnée</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="449"/> + <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> + <translation><b>Configuration</b><p>Affiche la page de configuration avec la page Subversion sélectionnée.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="288"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="291"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <source>Show change lists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="184"/> + <source>Show the change lists and associated files of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="187"/> + <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> - <source>Configure</source> - <translation>Configuration</translation> + <source>Upgrade</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> - <source>Configure...</source> - <translation>Configuration...</translation> + <source>Upgrade...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="461"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation>Afficher la page de configuration avec la page Subversion sélectionnée</translation> + <source>Upgrade the working copy to the current format</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="464"/> - <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> - <translation><b>Configuration</b><p>Affiche la page de configuration avec la page Subversion sélectionnée.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="303"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="306"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="194"/> - <source>Show change lists</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="199"/> - <source>Show the change lists and associated files of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="202"/> - <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="472"/> - <source>Upgrade</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="472"/> - <source>Upgrade...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="476"/> - <source>Upgrade the working copy to the current format</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="479"/> <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="132"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="148"/> <source>Show differences (URLs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="124"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="140"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="156"/> <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="559"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="543"/> <source>Subversion (svn)</source> <translation type="unfinished">Subversion (svn)</translation> </message> @@ -59570,12 +59880,12 @@ <translation>Tous</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="66"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="62"/> <source>Language:</source> <translation>Langue:</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="70"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="69"/> <source>GROUP</source> <translation>GROUP</translation> </message> @@ -59620,12 +59930,12 @@ <translation>Groupe:</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="103"/> <source>Close dialog</source> <translation>Fermer la fenêtre</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="103"/> <source>Do you really want to close the dialog?</source> <translation>Voulez-vous réellement fermer cette fenêtre?</translation> </message> @@ -61345,7 +61655,7 @@ <context> <name>UnittestDialog</name> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.py" line="403"/> <source>Unittest</source> <translation>Tests unitaires</translation> </message> @@ -61360,17 +61670,17 @@ <translation>^Erreur:</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="266"/> + <location filename="../PyUnit/UnittestDialog.py" line="269"/> <source>You must enter a test suite file.</source> <translation>Vous devez entrer un fichier test correct.</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="274"/> + <location filename="../PyUnit/UnittestDialog.py" line="277"/> <source>Preparing Testsuite</source> <translation>Préparation de Testsuite</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="469"/> + <location filename="../PyUnit/UnittestDialog.py" line="475"/> <source>Running</source> <translation>En cours d'execution</translation> </message> @@ -61550,42 +61860,42 @@ <translation><b>Stopper le test</b><p>Stoppe le test unittest en cours.</p></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="634"/> + <location filename="../PyUnit/UnittestDialog.py" line="640"/> <source>Show Source</source> <translation>Afficher les sources</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="206"/> + <location filename="../PyUnit/UnittestDialog.py" line="209"/> <source>Python Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="202"/> + <location filename="../PyUnit/UnittestDialog.py" line="205"/> <source>Python3 Files ({1});;Python2 Files ({0});;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.py" line="403"/> <source><p>Unable to run test <b>{0}</b>.<br>{1}<br>{2}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="493"/> + <location filename="../PyUnit/UnittestDialog.py" line="499"/> <source>Ran {0} test in {1:.3f}s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="497"/> + <location filename="../PyUnit/UnittestDialog.py" line="503"/> <source>Ran {0} tests in {1:.3f}s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="514"/> + <location filename="../PyUnit/UnittestDialog.py" line="520"/> <source>Failure: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="529"/> + <location filename="../PyUnit/UnittestDialog.py" line="535"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> @@ -61620,17 +61930,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="544"/> + <location filename="../PyUnit/UnittestDialog.py" line="550"/> <source> Skipped: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="559"/> + <location filename="../PyUnit/UnittestDialog.py" line="565"/> <source> Expected Failure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="573"/> + <location filename="../PyUnit/UnittestDialog.py" line="579"/> <source> Unexpected Success</source> <translation type="unfinished"></translation> </message> @@ -64009,7 +64319,7 @@ <context> <name>Utilities</name> <message> - <location filename="../Utilities/__init__.py" line="1400"/> + <location filename="../Utilities/__init__.py" line="1403"/> <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> @@ -64235,8 +64545,8 @@ <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="81"/> <source><b>Globals Filter List</b> -<p>Select the variable types you want to be filtered out of the globals variables list.</p<</source> - <translation><b>Liste des filtres de variables globales</b> +<p>Select the variable types you want to be shown in the global variables viewer.</p<</source> + <translation type="unfinished"><b>Liste des filtres de variables globales</b> <p>Sélectionnez les types de variables que vous souhaitez filtrer dans la liste des variables globales.</p<</translation> </message> <message> @@ -64247,25 +64557,30 @@ <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="61"/> <source><b>Locals Filter List</b> -<p>Select the variable types you want to be filtered out of the locals variables list.</p<</source> - <translation><b>Liste des filtres de variables locales</b> +<p>Select the variable types you want to be shown in the local variables viewer.</p<</source> + <translation type="unfinished"><b>Liste des filtres de variables locales</b> <p>Sélectionnez les types de variables que vous souhaitez filtrer dans la liste des variables locales.</p<</translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="48"/> - <source>&Globals Filter</source> - <translation>Filtre de variables &globales</translation> + <source>&Globals Viewer</source> + <translation type="unfinished">Filtre de variables &globales</translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="38"/> - <source>&Locals Filter</source> - <translation>Filtre de variables &locales</translation> + <source>&Locals Viewer</source> + <translation type="unfinished">Filtre de variables &locales</translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.py" line="42"/> <source>Save Default</source> <translation>Enregistrer par défaut</translation> </message> + <message> + <location filename="../Debugger/VariablesFilterDialog.ui" line="28"/> + <source>Select the variable types to be shown in the variables viewers:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VariablesViewer</name> @@ -64841,7 +65156,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="532"/> + <location filename="../VCS/ProjectHelper.py" line="533"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -64856,7 +65171,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="532"/> + <location filename="../VCS/ProjectHelper.py" line="533"/> <source>Switch</source> <translation type="unfinished">Basculer de version</translation> </message> @@ -64936,17 +65251,17 @@ <context> <name>VersionControl</name> <message> - <location filename="../VCS/VersionControl.py" line="573"/> + <location filename="../VCS/VersionControl.py" line="563"/> <source>Process Generation Error</source> <translation>Erreur du processus</translation> </message> <message> - <location filename="../VCS/VersionControl.py" line="704"/> + <location filename="../VCS/VersionControl.py" line="694"/> <source>Repository status checking is switched off</source> <translation>La vérification de statut du référentiel est désactivée</translation> </message> <message> - <location filename="../VCS/VersionControl.py" line="573"/> + <location filename="../VCS/VersionControl.py" line="563"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> @@ -72216,24 +72531,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1459"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1426"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Modifications</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Étiquettes</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1446"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -72242,23 +72557,23 @@ <tr><td><b>Heure de soumission</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Suggestion</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Modifications</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Parents</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -72269,12 +72584,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Signets</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -72285,13 +72600,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2078"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2083"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> @@ -72798,50 +73113,55 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="240"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="243"/> <source>do not assign a lambda expression, use a def</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="243"/> - <source>ambiguous variable name '{0}'</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="246"/> - <source>ambiguous class definition '{0}'</source> + <source>ambiguous variable name '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="249"/> - <source>ambiguous function definition '{0}'</source> + <source>ambiguous class definition '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="252"/> - <source>{0}: {1}</source> + <source>ambiguous function definition '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="255"/> + <source>{0}: {1}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="258"/> <source>{0}</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="240"/> + <source>do not use bare except</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>subversion</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1741"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1720"/> <source>unknown</source> <translation>inconnu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1606"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1586"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Information référentiel</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Version en cours</b></td><td>{2}</td></tr><tr><td><b>Version soumise</b></td><td>{3}</td></tr><tr><td><b>Date de la soumission</b></td><td>{4}</td></tr><tr><td><b>Heure de la soumission</b></td><td>{5}</td></tr><tr><td><b>Dernier auteur</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1746"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1725"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Informations sur le référentiel</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>API Subversion V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Révision actuelle</b></td><td>{4}</td></tr><tr><td><b>Révision validée</b></td><td>{5}</td></tr><tr><td><b>Date de validation</b></td><td>{6}</td></tr><tr><td><b>Heure de validation</b></td><td>{7}</td></tr><tr><td><b>Dernier auteur</b></td><td>{8}</td></tr></table></translation> </message>
diff -r 852016bbdedb -r c307358a2ecc i18n/eric6_it.ts --- a/i18n/eric6_it.ts Fri Jan 27 19:18:52 2017 +0100 +++ b/i18n/eric6_it.ts Fri Feb 03 19:20:59 2017 +0100 @@ -3633,147 +3633,147 @@ <context> <name>CodeStyleFixer</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="494"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> <source>Triple single quotes converted to triple double quotes.</source> <translation>Triple virgolette singole convertite in triple virgolette doppie.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> - <source>Introductory quotes corrected to be {0}"""</source> - <translation>Virgolette introduttive corrette in {0}"""</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="500"/> - <source>Single line docstring put on one line.</source> - <translation>Singole righe documentazione raggruppate su una sola.</translation> + <source>Introductory quotes corrected to be {0}"""</source> + <translation>Virgolette introduttive corrette in {0}"""</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="503"/> + <source>Single line docstring put on one line.</source> + <translation>Singole righe documentazione raggruppate su una sola.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="506"/> <source>Period added to summary line.</source> <translation>Aggiunto punto alla riga sommario.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> <source>Blank line before function/method docstring removed.</source> <translation>Riga vuota prima della stringa di documentazione funzione/metodo rimossa.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="509"/> - <source>Blank line inserted before class docstring.</source> - <translation>Riga vuota inserita prima della stringa di documentazione della classe.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="512"/> - <source>Blank line inserted after class docstring.</source> - <translation>Linea vuota inserita dopo la stringa di documentazione della classe.</translation> + <source>Blank line inserted before class docstring.</source> + <translation>Riga vuota inserita prima della stringa di documentazione della classe.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="515"/> - <source>Blank line inserted after docstring summary.</source> - <translation>Linea vuota inserita dopo la stringa di documentazione del sommario.</translation> + <source>Blank line inserted after class docstring.</source> + <translation>Linea vuota inserita dopo la stringa di documentazione della classe.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="518"/> - <source>Blank line inserted after last paragraph of docstring.</source> - <translation>Linea vuota inserita dopo l'ultimo paragrafo della stringa di documentazione.</translation> + <source>Blank line inserted after docstring summary.</source> + <translation>Linea vuota inserita dopo la stringa di documentazione del sommario.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="521"/> - <source>Leading quotes put on separate line.</source> - <translation>Le virgolette di testa messe su una riga separata.</translation> + <source>Blank line inserted after last paragraph of docstring.</source> + <translation>Linea vuota inserita dopo l'ultimo paragrafo della stringa di documentazione.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="524"/> - <source>Trailing quotes put on separate line.</source> - <translation>Le virgolette di coda messe su una riga separata.</translation> + <source>Leading quotes put on separate line.</source> + <translation>Le virgolette di testa messe su una riga separata.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="527"/> + <source>Trailing quotes put on separate line.</source> + <translation>Le virgolette di coda messe su una riga separata.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> <source>Blank line before class docstring removed.</source> <translation>Rimossa riga vuota prima della stringa di documentazione.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> - <source>Blank line after class docstring removed.</source> - <translation>Rimossa riga vuota dopo della stringa di documentazione.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="536"/> - <source>Blank line after function/method docstring removed.</source> - <translation>Riga vuota dopo la stringa di documentazione funzione/metodo rimossa.</translation> + <source>Blank line after class docstring removed.</source> + <translation>Rimossa riga vuota dopo della stringa di documentazione.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="539"/> - <source>Blank line after last paragraph removed.</source> - <translation>Rimossa riga vuota dopo l'ultimo paragrafo.</translation> + <source>Blank line after function/method docstring removed.</source> + <translation>Riga vuota dopo la stringa di documentazione funzione/metodo rimossa.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="542"/> - <source>Tab converted to 4 spaces.</source> - <translation>Convertita Tabulazione in 4 spazi.</translation> + <source>Blank line after last paragraph removed.</source> + <translation>Rimossa riga vuota dopo l'ultimo paragrafo.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="545"/> - <source>Indentation adjusted to be a multiple of four.</source> - <translation>Identazione portata ad un multiplo di quattro.</translation> + <source>Tab converted to 4 spaces.</source> + <translation>Convertita Tabulazione in 4 spazi.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="548"/> - <source>Indentation of continuation line corrected.</source> - <translation>Identazione di continuazione riga corretta.</translation> + <source>Indentation adjusted to be a multiple of four.</source> + <translation>Identazione portata ad un multiplo di quattro.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="551"/> - <source>Indentation of closing bracket corrected.</source> - <translation>Identazione di parentesi chiusa corretta.</translation> + <source>Indentation of continuation line corrected.</source> + <translation>Identazione di continuazione riga corretta.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="554"/> - <source>Missing indentation of continuation line corrected.</source> - <translation>Corretta la mancanza di indentazione della continuazione riga.</translation> + <source>Indentation of closing bracket corrected.</source> + <translation>Identazione di parentesi chiusa corretta.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="557"/> - <source>Closing bracket aligned to opening bracket.</source> - <translation>Parentesi chiusa allineata con quella d'apertura.</translation> + <source>Missing indentation of continuation line corrected.</source> + <translation>Corretta la mancanza di indentazione della continuazione riga.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="560"/> - <source>Indentation level changed.</source> - <translation>Livello di indentazione modificato.</translation> + <source>Closing bracket aligned to opening bracket.</source> + <translation>Parentesi chiusa allineata con quella d'apertura.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="563"/> - <source>Indentation level of hanging indentation changed.</source> - <translation>Modificato il livello di indentazione dell'indentazione pendente.</translation> + <source>Indentation level changed.</source> + <translation>Livello di indentazione modificato.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="566"/> + <source>Indentation level of hanging indentation changed.</source> + <translation>Modificato il livello di indentazione dell'indentazione pendente.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="569"/> <source>Visual indentation corrected.</source> <translation></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="584"/> + <source>Extraneous whitespace removed.</source> + <translation>Spazio non pertinente eliminato.</translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="581"/> - <source>Extraneous whitespace removed.</source> - <translation>Spazio non pertinente eliminato.</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="578"/> <source>Missing whitespace added.</source> <translation>Spazi mancanti aggiunti.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="584"/> - <source>Whitespace around comment sign corrected.</source> - <translation>Corretto spazio vicino al segno di commento.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="587"/> + <source>Whitespace around comment sign corrected.</source> + <translation>Corretto spazio vicino al segno di commento.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="590"/> <source>One blank line inserted.</source> <translation>Inserita una riga vuota.</translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="591"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> <source>%n blank line(s) inserted.</source> <translation type="unfinished"> <numerusform>%n riga vuota inserita.</numerusform> @@ -3781,7 +3781,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="597"/> <source>%n superfluous lines removed</source> <translation type="unfinished"> <numerusform>%n riga superflua eliminata</numerusform> @@ -3789,77 +3789,77 @@ </translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="598"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="601"/> <source>Superfluous blank lines removed.</source> <translation>Righe vuote superflue eliminate.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="601"/> - <source>Superfluous blank lines after function decorator removed.</source> - <translation>Righe vuote superflue eliminate dopo a dichiarazione della funzione.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="604"/> - <source>Imports were put on separate lines.</source> - <translation>Import messi su righe separate.</translation> + <source>Superfluous blank lines after function decorator removed.</source> + <translation>Righe vuote superflue eliminate dopo a dichiarazione della funzione.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="607"/> - <source>Long lines have been shortened.</source> - <translation>Accorciate righe lughe.</translation> + <source>Imports were put on separate lines.</source> + <translation>Import messi su righe separate.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="610"/> + <source>Long lines have been shortened.</source> + <translation>Accorciate righe lughe.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="613"/> <source>Redundant backslash in brackets removed.</source> <translation>Rimossi barre rovesciate ridondanti.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="616"/> - <source>Compound statement corrected.</source> - <translation>Corretta istruzione composta.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="619"/> - <source>Comparison to None/True/False corrected.</source> - <translation>Corretta comparazione con None/True/False.</translation> + <source>Compound statement corrected.</source> + <translation>Corretta istruzione composta.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="622"/> - <source>'{0}' argument added.</source> - <translation>'{0}' argumento aggiunto.</translation> + <source>Comparison to None/True/False corrected.</source> + <translation>Corretta comparazione con None/True/False.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="625"/> - <source>'{0}' argument removed.</source> - <translation>'{0}' argumento rimosso.</translation> + <source>'{0}' argument added.</source> + <translation>'{0}' argumento aggiunto.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="628"/> - <source>Whitespace stripped from end of line.</source> - <translation>Eliminati gli spazi alla fine della linea.</translation> + <source>'{0}' argument removed.</source> + <translation>'{0}' argumento rimosso.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="631"/> - <source>newline added to end of file.</source> - <translation>Aggiunta una nuova riga alla fine del file.</translation> + <source>Whitespace stripped from end of line.</source> + <translation>Eliminati gli spazi alla fine della linea.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="634"/> - <source>Superfluous trailing blank lines removed from end of file.</source> - <translation>Rghe vuote superflue eliminate dalla fine del file.</translation> + <source>newline added to end of file.</source> + <translation>Aggiunta una nuova riga alla fine del file.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="637"/> + <source>Superfluous trailing blank lines removed from end of file.</source> + <translation>Rghe vuote superflue eliminate dalla fine del file.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="640"/> <source>'<>' replaced by '!='.</source> <translation>'<>' sostituito da '!='.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="641"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="644"/> <source>Could not save the file! Skipping it. Reason: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="710"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="713"/> <source> no message defined for code '{0}'</source> <translation type="unfinished"></translation> </message> @@ -7383,197 +7383,197 @@ <context> <name>DocStyleChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="260"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="263"/> <source>module is missing a docstring</source> <translation>Modulo mancante di docstring</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="262"/> - <source>public function/method is missing a docstring</source> - <translation>Funzione/metodo pubblico mancante di docstring</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="265"/> - <source>private function/method may be missing a docstring</source> - <translation>Funzione/metodo pubblico con possibile mancanza di docstring</translation> + <source>public function/method is missing a docstring</source> + <translation>Funzione/metodo pubblico mancante di docstring</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="268"/> + <source>private function/method may be missing a docstring</source> + <translation>Funzione/metodo pubblico con possibile mancanza di docstring</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="271"/> <source>public class is missing a docstring</source> <translation>Classe pubblica mancante di docstring</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="270"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="273"/> <source>private class may be missing a docstring</source> <translation>Classe privata con possibile mancanza di docstring</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="272"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="275"/> <source>docstring not surrounded by """</source> <translation>docstring non inserita fra """</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="274"/> - <source>docstring containing \ not surrounded by r"""</source> - <translation>docstring contenente \ non inserita fra r"""</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="277"/> - <source>docstring containing unicode character not surrounded by u"""</source> - <translation>docstring contenente carattere unicode non inserito fra u"""</translation> + <source>docstring containing \ not surrounded by r"""</source> + <translation>docstring contenente \ non inserita fra r"""</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="280"/> + <source>docstring containing unicode character not surrounded by u"""</source> + <translation>docstring contenente carattere unicode non inserito fra u"""</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="283"/> <source>one-liner docstring on multiple lines</source> <translation>docstring in linea su righe multiple</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="282"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="285"/> <source>docstring has wrong indentation</source> <translation>docstring ha un'indentazione errata</translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="328"/> + <source>docstring summary does not end with a period</source> + <translation>docstring sommario non si conclude con un punto</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="291"/> + <source>docstring summary is not in imperative mood (Does instead of Do)</source> + <translation>docstring sommario non è in modo imperativo (farebbe invece di fa)</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="295"/> + <source>docstring summary looks like a function's/method's signature</source> + <translation>docstring sommario sembra una firma di funzione/metodo</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="298"/> + <source>docstring does not mention the return value type</source> + <translation>docstring non indica il tipo di valore di ritorno</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="301"/> + <source>function/method docstring is separated by a blank line</source> + <translation>docstring funzione/metodo è separato da una riga vuota</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="304"/> + <source>class docstring is not preceded by a blank line</source> + <translation>docstring della classe non è preceduta da una riga vuota</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="307"/> + <source>class docstring is not followed by a blank line</source> + <translation>docstring della classe non è seguita da una riga vuota</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="362"/> + <source>docstring summary is not followed by a blank line</source> + <translation>docstring sommario non è seguito da una riga vuota</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="313"/> + <source>last paragraph of docstring is not followed by a blank line</source> + <translation>L'ultimo paragrafo della docstring non è seguito da una riga vuota</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="317"/> + <source>private function/method is missing a docstring</source> + <translation>Funzione/metodo privato mancante di docstring</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="320"/> + <source>private class is missing a docstring</source> + <translation>Classe privata mancante di docstring</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="322"/> + <source>leading quotes of docstring not on separate line</source> + <translation>Virgolette iniziali della docstring non sono su riga separata</translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="325"/> - <source>docstring summary does not end with a period</source> - <translation>docstring sommario non si conclude con un punto</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="288"/> - <source>docstring summary is not in imperative mood (Does instead of Do)</source> - <translation>docstring sommario non è in modo imperativo (farebbe invece di fa)</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="292"/> - <source>docstring summary looks like a function's/method's signature</source> - <translation>docstring sommario sembra una firma di funzione/metodo</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="295"/> - <source>docstring does not mention the return value type</source> - <translation>docstring non indica il tipo di valore di ritorno</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="298"/> - <source>function/method docstring is separated by a blank line</source> - <translation>docstring funzione/metodo è separato da una riga vuota</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="301"/> - <source>class docstring is not preceded by a blank line</source> - <translation>docstring della classe non è preceduta da una riga vuota</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="304"/> - <source>class docstring is not followed by a blank line</source> - <translation>docstring della classe non è seguita da una riga vuota</translation> + <source>trailing quotes of docstring not on separate line</source> + <translation>Virgolette finali della docstring non sono su riga separata</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="332"/> + <source>docstring does not contain a @return line but function/method returns something</source> + <translation>docstring non contiene una riga @return ma la funzione/metodo ritorna dei valori</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="336"/> + <source>docstring contains a @return line but function/method doesn't return anything</source> + <translation>docstring contiene una riga @return ma la funzione/metodo non ritorna dei valori</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="340"/> + <source>docstring does not contain enough @param/@keyparam lines</source> + <translation>docstring non contiene sufficienti righe @param/@keyparam</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="343"/> + <source>docstring contains too many @param/@keyparam lines</source> + <translation>docstring contiene troppe righe @param/@keyparam</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="346"/> + <source>keyword only arguments must be documented with @keyparam lines</source> + <translation>Argomenti con una sola parola-chiave devono essere documentati con righe @keyparam</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="349"/> + <source>order of @param/@keyparam lines does not match the function/method signature</source> + <translation>La sequenza di righe @param/@keyparam non si raccorda con le definizioni funzione/metodo</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="352"/> + <source>class docstring is preceded by a blank line</source> + <translation>docstring della classe è preceduta da una riga vuota</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="354"/> + <source>class docstring is followed by a blank line</source> + <translation>docstring della classe è seguita da una riga vuota</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="356"/> + <source>function/method docstring is preceded by a blank line</source> + <translation>docstring funzione/metodo è preceduto da una riga vuota</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="359"/> - <source>docstring summary is not followed by a blank line</source> - <translation>docstring sommario non è seguito da una riga vuota</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="310"/> - <source>last paragraph of docstring is not followed by a blank line</source> - <translation>L'ultimo paragrafo della docstring non è seguito da una riga vuota</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="314"/> - <source>private function/method is missing a docstring</source> - <translation>Funzione/metodo privato mancante di docstring</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="317"/> - <source>private class is missing a docstring</source> - <translation>Classe privata mancante di docstring</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="319"/> - <source>leading quotes of docstring not on separate line</source> - <translation>Virgolette iniziali della docstring non sono su riga separata</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="322"/> - <source>trailing quotes of docstring not on separate line</source> - <translation>Virgolette finali della docstring non sono su riga separata</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="329"/> - <source>docstring does not contain a @return line but function/method returns something</source> - <translation>docstring non contiene una riga @return ma la funzione/metodo ritorna dei valori</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="333"/> - <source>docstring contains a @return line but function/method doesn't return anything</source> - <translation>docstring contiene una riga @return ma la funzione/metodo non ritorna dei valori</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="337"/> - <source>docstring does not contain enough @param/@keyparam lines</source> - <translation>docstring non contiene sufficienti righe @param/@keyparam</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="340"/> - <source>docstring contains too many @param/@keyparam lines</source> - <translation>docstring contiene troppe righe @param/@keyparam</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="343"/> - <source>keyword only arguments must be documented with @keyparam lines</source> - <translation>Argomenti con una sola parola-chiave devono essere documentati con righe @keyparam</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="346"/> - <source>order of @param/@keyparam lines does not match the function/method signature</source> - <translation>La sequenza di righe @param/@keyparam non si raccorda con le definizioni funzione/metodo</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="349"/> - <source>class docstring is preceded by a blank line</source> - <translation>docstring della classe è preceduta da una riga vuota</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="351"/> - <source>class docstring is followed by a blank line</source> - <translation>docstring della classe è seguita da una riga vuota</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="353"/> - <source>function/method docstring is preceded by a blank line</source> - <translation>docstring funzione/metodo è preceduto da una riga vuota</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="356"/> <source>function/method docstring is followed by a blank line</source> <translation>docstring funzione/metodo è seguito da una riga vuota</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="362"/> - <source>last paragraph of docstring is followed by a blank line</source> - <translation>L'ultimo paragrafo della docstring è seguito da una riga vuota</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="365"/> + <source>last paragraph of docstring is followed by a blank line</source> + <translation>L'ultimo paragrafo della docstring è seguito da una riga vuota</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="368"/> <source>docstring does not contain a @exception line but function/method raises an exception</source> <translation>docstring non contiene una riga @exception ma la funzione/metodo causa un'eccezione</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="369"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="372"/> <source>docstring contains a @exception line but function/method doesn't raise an exception</source> <translation>docstring contiene una riga @return ma la funzione/metodo non causa un'eccezione</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="374"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="377"/> <source>{0}: {1}</source> <translation>{0}: {1}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="284"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="287"/> <source>docstring does not contain a summary</source> <translation>docstring non contiene un sommario</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="327"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="330"/> <source>docstring summary does not start with '{0}'</source> <translation type="unfinished"></translation> </message> @@ -9412,92 +9412,92 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="658"/> + <location filename="../QScintilla/Editor.py" line="661"/> <source>Undo</source> <translation>Annulla</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="661"/> - <source>Redo</source> - <translation>Rifai</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="664"/> + <source>Redo</source> + <translation>Rifai</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="667"/> <source>Revert to last saved state</source> <translation>Ritorna all'ultimo stato salvato</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="668"/> - <source>Cut</source> - <translation>Taglia</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="671"/> - <source>Copy</source> - <translation>Copia</translation> + <source>Cut</source> + <translation>Taglia</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="674"/> + <source>Copy</source> + <translation>Copia</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="677"/> <source>Paste</source> <translation>Incolla</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="679"/> - <source>Indent</source> - <translation>Identa</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="682"/> - <source>Unindent</source> - <translation>Annulla identazione</translation> + <source>Indent</source> + <translation>Identa</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="685"/> - <source>Comment</source> - <translation>Commenta</translation> + <source>Unindent</source> + <translation>Annulla identazione</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="688"/> - <source>Uncomment</source> - <translation>Annulla commenta</translation> + <source>Comment</source> + <translation>Commenta</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="691"/> - <source>Stream Comment</source> - <translation>Flusso commento</translation> + <source>Uncomment</source> + <translation>Annulla commenta</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="694"/> + <source>Stream Comment</source> + <translation>Flusso commento</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="697"/> <source>Box Comment</source> <translation>Commenti nel riquadro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="698"/> - <source>Select to brace</source> - <translation>Seleziona per parentesizzare</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="700"/> - <source>Select all</source> - <translation>Seleziona tutti</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="701"/> + <source>Select to brace</source> + <translation>Seleziona per parentesizzare</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="703"/> + <source>Select all</source> + <translation>Seleziona tutti</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="704"/> <source>Deselect all</source> <translation>Deseleziona tutti</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="715"/> + <location filename="../QScintilla/Editor.py" line="718"/> <source>Shorten empty lines</source> <translation>Abbrevia righe vuote</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="907"/> + <location filename="../QScintilla/Editor.py" line="910"/> <source>Languages</source> <translation>Linguaggi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="722"/> + <location filename="../QScintilla/Editor.py" line="725"/> <source>Use Monospaced Font</source> <translation>Usa un font Monospaced</translation> </message> @@ -9507,422 +9507,422 @@ <translation type="obsolete">Autocompletamento abilitato</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="837"/> + <location filename="../QScintilla/Editor.py" line="840"/> <source>Check</source> <translation>Controlla</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="857"/> - <source>Show</source> - <translation>Mostra</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="768"/> - <source>Close</source> - <translation>Chiudi</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="774"/> - <source>Save</source> - <translation>Salva</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="777"/> - <source>Save As...</source> - <translation>Salva come...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="793"/> - <source>Print</source> - <translation>Stampa</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="859"/> - <source>Code metrics...</source> - <translation>Statistiche codice...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="860"/> + <source>Show</source> + <translation>Mostra</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="771"/> + <source>Close</source> + <translation>Chiudi</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="777"/> + <source>Save</source> + <translation>Salva</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="780"/> + <source>Save As...</source> + <translation>Salva come...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="796"/> + <source>Print</source> + <translation>Stampa</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="862"/> + <source>Code metrics...</source> + <translation>Statistiche codice...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="863"/> <source>Code coverage...</source> <translation>Analisi codice...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="868"/> + <location filename="../QScintilla/Editor.py" line="871"/> <source>Profile data...</source> <translation>Profilazione dati...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1153"/> + <location filename="../QScintilla/Editor.py" line="1156"/> <source>Toggle bookmark</source> <translation>Inverti bookmark</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1155"/> + <location filename="../QScintilla/Editor.py" line="1158"/> <source>Next bookmark</source> <translation>Prossimo segnalibro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1157"/> + <location filename="../QScintilla/Editor.py" line="1160"/> <source>Previous bookmark</source> <translation>Segnalibro precedente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1159"/> + <location filename="../QScintilla/Editor.py" line="1162"/> <source>Clear all bookmarks</source> <translation>Pulisci di tutti di segnalibri</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1179"/> + <location filename="../QScintilla/Editor.py" line="1182"/> <source>Toggle breakpoint</source> <translation>Abilita/Disabilita breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1184"/> + <location filename="../QScintilla/Editor.py" line="1187"/> <source>Edit breakpoint...</source> <translation>Modifica Breakpoint...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5154"/> + <location filename="../QScintilla/Editor.py" line="5161"/> <source>Enable breakpoint</source> <translation>Abilita breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1189"/> + <location filename="../QScintilla/Editor.py" line="1192"/> <source>Next breakpoint</source> <translation>Prossimo breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1191"/> + <location filename="../QScintilla/Editor.py" line="1194"/> <source>Previous breakpoint</source> <translation>Breakpoint precedente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1193"/> + <location filename="../QScintilla/Editor.py" line="1196"/> <source>Clear all breakpoints</source> <translation>Elimina tutti i breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1213"/> + <location filename="../QScintilla/Editor.py" line="1216"/> <source>LMB toggles bookmarks</source> <translation>Inverti bookmark LMB</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1217"/> + <location filename="../QScintilla/Editor.py" line="1220"/> <source>LMB toggles breakpoints</source> <translation>Toggle Breakpoint LMB</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1752"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>Modification of Read Only file</source> <translation>Modifica di un file di sola lettura</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1752"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Stai tentando di modificare un file in sola lettura. Per favore prima salva come un file diverso.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2443"/> + <location filename="../QScintilla/Editor.py" line="2448"/> <source>Printing...</source> <translation>In stampa...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2460"/> - <source>Printing completed</source> - <translation>Stampa completata</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2462"/> - <source>Error while printing</source> - <translation>Errore durante la stampa</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2465"/> + <source>Printing completed</source> + <translation>Stampa completata</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2467"/> + <source>Error while printing</source> + <translation>Errore durante la stampa</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2470"/> <source>Printing aborted</source> <translation>Stampa annullata</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2878"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source>Open File</source> <translation>Apri File</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3041"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source>Save File</source> <translation>Salva file</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2823"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source>File Modified</source> <translation>File modificato</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4427"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion</source> <translation>Autocompletamento</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4427"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>L'autocomplentamento non è disponibile perchè non ci sono fonti impostate.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5157"/> + <location filename="../QScintilla/Editor.py" line="5164"/> <source>Disable breakpoint</source> <translation>Disabilita breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5531"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Code Coverage</source> <translation>Analisi codice</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5531"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Please select a coverage file</source> <translation>Per favore seleziona un file per l'analisi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5709"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Profile Data</source> <translation>Profilazione dati</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5709"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Please select a profile file</source> <translation>Per favore seleziona un file per la profilazione</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6184"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Macro Name</source> <translation>Nome Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6184"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Select a macro name:</source> <translation>Seleziona un nome per la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6255"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Macro files (*.macro)</source> <translation>File Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6212"/> + <location filename="../QScintilla/Editor.py" line="6219"/> <source>Load macro file</source> <translation>Carica un file di macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6235"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source>Error loading macro</source> <translation>Errore nel caricamento della macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6255"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Save macro file</source> <translation>Salva un file di macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6272"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source>Save macro</source> <translation>Salva macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6288"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source>Error saving macro</source> <translation>Errore nel salvataggio della macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6301"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Start Macro Recording</source> <translation>Avvia registrazione della macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6327"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Macro Recording</source> <translation>Registrazione Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6327"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Enter name of the macro:</source> <translation>Inserisci un nome per la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6465"/> + <location filename="../QScintilla/Editor.py" line="6472"/> <source>File changed</source> <translation>File modificato</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="727"/> + <location filename="../QScintilla/Editor.py" line="730"/> <source>Autosave enabled</source> <translation>Salvataggio automatico abilitato</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1162"/> + <location filename="../QScintilla/Editor.py" line="1165"/> <source>Goto syntax error</source> <translation>Vai all'errore di sintassi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1166"/> + <location filename="../QScintilla/Editor.py" line="1169"/> <source>Clear syntax error</source> <translation>Elimina errori di sintassi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6769"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source>Drop Error</source> <translation>Errore Drop</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1164"/> + <location filename="../QScintilla/Editor.py" line="1167"/> <source>Show syntax error message</source> <translation>Mostra i messaggi degli errori di sintassi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5869"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>Syntax Error</source> <translation>Errore di sintassi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5869"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>No syntax error message available.</source> <translation>Nessun messaggio degli errori di sintassi disponibile.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1181"/> + <location filename="../QScintilla/Editor.py" line="1184"/> <source>Toggle temporary breakpoint</source> <translation>Abilita/Disabilita breakpoint temporaneo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="862"/> - <source>Show code coverage annotations</source> - <translation>Mostra le annotazioni dell'analisi del codice</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="865"/> + <source>Show code coverage annotations</source> + <translation>Mostra le annotazioni dell'analisi del codice</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="868"/> <source>Hide code coverage annotations</source> <translation>Nascondi le annotazioni dell'analisi del codice</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1196"/> - <source>Next uncovered line</source> - <translation>Prossimo file non analizzato</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1199"/> + <source>Next uncovered line</source> + <translation>Prossimo file non analizzato</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1202"/> <source>Previous uncovered line</source> <translation>File non analizzato precedente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5594"/> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>Show Code Coverage Annotations</source> <translation>Mostra le annotazioni dell'analisi del codice</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5587"/> - <source>All lines have been covered.</source> - <translation>Tutte le linee sono state analizzate.</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="5594"/> + <source>All lines have been covered.</source> + <translation>Tutte le linee sono state analizzate.</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>There is no coverage file available.</source> <translation>Non ci sono file di analisi disponibili.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="881"/> + <location filename="../QScintilla/Editor.py" line="884"/> <source>Diagrams</source> <translation>Diagrammi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="883"/> + <location filename="../QScintilla/Editor.py" line="886"/> <source>Class Diagram...</source> <translation>Diagrammi di classe...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="885"/> + <location filename="../QScintilla/Editor.py" line="888"/> <source>Package Diagram...</source> <translation>Diagrammi del package...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="887"/> + <location filename="../QScintilla/Editor.py" line="890"/> <source>Imports Diagram...</source> <translation>Importa diagrammi...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="889"/> + <location filename="../QScintilla/Editor.py" line="892"/> <source>Application Diagram...</source> <translation>Diagrammi dell'applicazione...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="910"/> + <location filename="../QScintilla/Editor.py" line="913"/> <source>No Language</source> <translation>Nessun linguaggio</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6790"/> + <location filename="../QScintilla/Editor.py" line="6797"/> <source>Resources</source> <translation>Risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6792"/> - <source>Add file...</source> - <translation>Aggiungi file...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6794"/> - <source>Add files...</source> - <translation>Aggiungi files...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6796"/> - <source>Add aliased file...</source> - <translation>Aggiungi file sinonimo...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6799"/> - <source>Add localized resource...</source> - <translation>Aggiungi una risorsa localizzata...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6822"/> - <source>Add file resource</source> - <translation>Aggiungi un file risorse</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6838"/> - <source>Add file resources</source> - <translation>Aggiundi dei file risorse</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6866"/> - <source>Add aliased file resource</source> - <translation>Aggiungi file sinonimo delle risorse</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6930"/> - <source>Package Diagram</source> - <translation>Diagrammi del package</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6930"/> - <source>Include class attributes?</source> - <translation>Includi gli attributi della classe ?</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6964"/> - <source>Application Diagram</source> - <translation>Diagrammi dell'applicazione</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6964"/> - <source>Include module names?</source> - <translation>Includi i nomi dei moduli ?</translation> + <source>Add file...</source> + <translation>Aggiungi file...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6801"/> + <source>Add files...</source> + <translation>Aggiungi files...</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="6803"/> + <source>Add aliased file...</source> + <translation>Aggiungi file sinonimo...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6806"/> + <source>Add localized resource...</source> + <translation>Aggiungi una risorsa localizzata...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6829"/> + <source>Add file resource</source> + <translation>Aggiungi un file risorse</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6845"/> + <source>Add file resources</source> + <translation>Aggiundi dei file risorse</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6873"/> + <source>Add aliased file resource</source> + <translation>Aggiungi file sinonimo delle risorse</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6937"/> + <source>Package Diagram</source> + <translation>Diagrammi del package</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6937"/> + <source>Include class attributes?</source> + <translation>Includi gli attributi della classe ?</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6971"/> + <source>Application Diagram</source> + <translation>Diagrammi dell'applicazione</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6971"/> + <source>Include module names?</source> + <translation>Includi i nomi dei moduli ?</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6810"/> <source>Add resource frame</source> <translation>Aggiungi riquadro delle risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6301"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Macro recording is already active. Start new?</source> <translation>Registrazione macro già attiva. Avvia nuovamente ?</translation> </message> @@ -9932,52 +9932,52 @@ <translation type="obsolete">Autocompletamento</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="819"/> + <location filename="../QScintilla/Editor.py" line="822"/> <source>Complete from Document</source> <translation type="unfinished">dal Documento</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="821"/> + <location filename="../QScintilla/Editor.py" line="824"/> <source>Complete from APIs</source> <translation type="unfinished">dalle APIs</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="823"/> + <location filename="../QScintilla/Editor.py" line="826"/> <source>Complete from Document and APIs</source> <translation type="unfinished">dal Documento e dalle APIs</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1202"/> + <location filename="../QScintilla/Editor.py" line="1205"/> <source>Next task</source> <translation>Prossimo task</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1204"/> + <location filename="../QScintilla/Editor.py" line="1207"/> <source>Previous task</source> <translation>Task precedente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1030"/> + <location filename="../QScintilla/Editor.py" line="1033"/> <source>Export as</source> <translation>Esporta come</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1253"/> + <location filename="../QScintilla/Editor.py" line="1256"/> <source>Export source</source> <translation>Esporta sorgenti</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1253"/> + <location filename="../QScintilla/Editor.py" line="1256"/> <source>No export format given. Aborting...</source> <translation>Nessun formato di export impostato. Annullamento...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6950"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Imports Diagram</source> <translation>Importa diagrammi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6950"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Include imports from external modules?</source> <translation>Includi gli import dai moduli esterni ?</translation> </message> @@ -9987,332 +9987,332 @@ <translation type="obsolete">dinamico</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="746"/> + <location filename="../QScintilla/Editor.py" line="749"/> <source>Calltip</source> <translation>Calltip</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="790"/> + <location filename="../QScintilla/Editor.py" line="793"/> <source>Print Preview</source> <translation>Anteprima Stampa</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="400"/> + <location filename="../QScintilla/Editor.py" line="403"/> <source><b>A Source Editor Window</b><p>This window is used to display and edit a source file. You can open as many of these as you like. The name of the file is displayed in the window's titlebar.</p><p>In order to set breakpoints just click in the space between the line numbers and the fold markers. Via the context menu of the margins they may be edited.</p><p>In order to set bookmarks just Shift click in the space between the line numbers and the fold markers.</p><p>These actions can be reversed via the context menu.</p><p>Ctrl clicking on a syntax error marker shows some info about this error.</p></source> <translation><b>Una finesta di edit</b><p>Questa finestra è usata per visualizzare e modificare un file sorgente. Si possono aprire quante finestre si vogliono. Il nome del file è mostrato nella barra dei titolo della finestra.</p><p>Per impostare dei breakpoint basta cliccare nello spazio tra i numeri di riga e i marcatori di compressione. Con il menù contestuale del margine possono essere modificati.</p><p>Per impostare un segnalibro basta cliccare con lo Shift premuto nello spazio tra il numero di linea e i marcatori di compressione.</p><p>Queste azioni possono essere invertite con il menù contestuale.</p><p> Cliccare con il tasto Ctrl premuto un marcatore di errore della sintassi mostra delle informazioni sull'errore.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="731"/> + <location filename="../QScintilla/Editor.py" line="734"/> <source>Typing aids enabled</source> <translation>Aiuti alla digitazione abilitati</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="994"/> + <location filename="../QScintilla/Editor.py" line="997"/> <source>End-of-Line Type</source> <translation>Tipo di fine-linea</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="998"/> + <location filename="../QScintilla/Editor.py" line="1001"/> <source>Unix</source> <translation>Unix</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1005"/> + <location filename="../QScintilla/Editor.py" line="1008"/> <source>Windows</source> <translation>Windows</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1012"/> + <location filename="../QScintilla/Editor.py" line="1015"/> <source>Macintosh</source> <translation>Macintosh</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="953"/> + <location filename="../QScintilla/Editor.py" line="956"/> <source>Encodings</source> <translation>Codifica</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="933"/> + <location filename="../QScintilla/Editor.py" line="936"/> <source>Guessed</source> <translation>Indovinato</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1268"/> + <location filename="../QScintilla/Editor.py" line="1271"/> <source>Alternatives</source> <translation>Alternative</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1284"/> + <location filename="../QScintilla/Editor.py" line="1287"/> <source>Pygments Lexer</source> <translation>Analizzatore lessicale Pygments</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1284"/> + <location filename="../QScintilla/Editor.py" line="1287"/> <source>Select the Pygments lexer to apply.</source> <translation>Selezione l'analizzatore lessicale di Pygments da applicare.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7242"/> + <location filename="../QScintilla/Editor.py" line="7249"/> <source>Check spelling...</source> <translation>Controllo sillabazione...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="707"/> + <location filename="../QScintilla/Editor.py" line="710"/> <source>Check spelling of selection...</source> <translation>Controllo sillabazione della selezione...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7245"/> + <location filename="../QScintilla/Editor.py" line="7252"/> <source>Add to dictionary</source> <translation>Aggiungi al dizionario</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7247"/> + <location filename="../QScintilla/Editor.py" line="7254"/> <source>Ignore All</source> <translation>Ignora tutto</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="711"/> + <location filename="../QScintilla/Editor.py" line="714"/> <source>Remove from dictionary</source> <translation>Rimuovi dal dizionario</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="340"/> + <location filename="../QScintilla/Editor.py" line="343"/> <source><p>The size of the file <b>{0}</b> is <b>{1} KB</b>. Do you really want to load it?</p></source> <translation><p>La dimensione del file <b>{0}</b> è <b>{1} KB</b>. Sei sicuro di volerlo caricare ?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1245"/> + <location filename="../QScintilla/Editor.py" line="1248"/> <source><p>No exporter available for the export format <b>{0}</b>. Aborting...</p></source> <translation><p>Nessun esportatore disponibile per il formato di export<b>{0}</b>. Termino...</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1264"/> + <location filename="../QScintilla/Editor.py" line="1267"/> <source>Alternatives ({0})</source> <translation>Alternative ({0})</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2823"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>Il file <b>{0}</b> contiene modifiche non salvate.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2878"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>Il file <b>{0}</b> non può essere aperto.<br />Motivo: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2982"/> + <location filename="../QScintilla/Editor.py" line="2987"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>Il file <b>{0}</b> non può essere salvato.<br />Motivo: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6226"/> + <location filename="../QScintilla/Editor.py" line="6233"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Il file macro <b>{0}</b> non può essere letto.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6235"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Il file macro <b>{0}</b> è danneggiato.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6288"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>Il file macro <b>{0}</b> non può essere scritto.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6629"/> + <location filename="../QScintilla/Editor.py" line="6636"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6769"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> non è un file.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6866"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias per il file <b>{0}</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1169"/> - <source>Next warning</source> - <translation>Warning successivo</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1172"/> + <source>Next warning</source> + <translation>Warning successivo</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1175"/> <source>Previous warning</source> <translation>Warning precedente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1174"/> + <location filename="../QScintilla/Editor.py" line="1177"/> <source>Show warning message</source> <translation>Mostra Warning</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1176"/> + <location filename="../QScintilla/Editor.py" line="1179"/> <source>Clear warnings</source> <translation>Pulisci warning</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3041"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6272"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file delle macro <b>{0}</b> esiste già.Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6123"/> - <source>Warning: {0}</source> - <translation>Attenzione: {0}</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6130"/> + <source>Warning: {0}</source> + <translation>Attenzione: {0}</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6137"/> <source>Error: {0}</source> <translation>Errore: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6461"/> + <location filename="../QScintilla/Editor.py" line="6468"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Attenzione:</b> con la riapertura le modifiche andranno perse.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4532"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Activating Auto-Completion Provider</source> <translation>Fornitore Autocompletamento in attivazione</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4532"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>Il fornitore di autocompletamento non può essere connesso perchè è gia attivo un altro. Per cortesia controlla la configurazione.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4852"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Activating Calltip Provider</source> <translation>Fornitore CallTip in attivazione</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4852"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>Il fornitore di autocompletamento non può essere connesso perchè è gia attivo un altro. Per cortesia controlla la configurazione.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="786"/> + <location filename="../QScintilla/Editor.py" line="789"/> <source>Open 'rejection' file</source> <translation>Apri file 'rifiuto'</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="893"/> + <location filename="../QScintilla/Editor.py" line="896"/> <source>Load Diagram...</source> <translation>Carica Diagramma...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1207"/> - <source>Next change</source> - <translation>Modifica successiva</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1210"/> + <source>Next change</source> + <translation>Modifica successiva</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1213"/> <source>Previous change</source> <translation>Modifica precedente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7659"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>Sort Lines</source> <translation>Righe ordinate</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7659"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>La selezione contiene dati non validi per un ordinamento numerico.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6059"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>Warning</source> <translation>Attenzione</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6059"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>No warning messages available.</source> <translation>Nessun messaggio di attenzione disponibile.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6120"/> + <location filename="../QScintilla/Editor.py" line="6127"/> <source>Style: {0}</source> <translation>Stile: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="760"/> - <source>New Document View</source> - <translation>Nuova vista Documento</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="763"/> + <source>New Document View</source> + <translation>Nuova vista Documento</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="766"/> <source>New Document View (with new split)</source> <translation>Nuova vista Documento (con nuova divisione)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="847"/> + <location filename="../QScintilla/Editor.py" line="850"/> <source>Tools</source> <translation>Strumenti</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="975"/> + <location filename="../QScintilla/Editor.py" line="978"/> <source>Re-Open With Encoding</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6455"/> + <location filename="../QScintilla/Editor.py" line="6462"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"><p>Il file <b>{0}</b> è stato modificato mentre era aperto in eric5. Rileggerlo ?</p> {0}?} {6.?}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="738"/> + <location filename="../QScintilla/Editor.py" line="741"/> <source>Automatic Completion enabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="816"/> + <location filename="../QScintilla/Editor.py" line="819"/> <source>Complete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4581"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4581"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7746"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7746"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="780"/> + <location filename="../QScintilla/Editor.py" line="783"/> <source>Save Copy...</source> <translation type="unfinished"></translation> </message> @@ -10395,7 +10395,7 @@ <translation>Premi per selezionare il file API dalla lista dei file API installati</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> <source>Add from installed APIs</source> <translation>Aggiungi dalle APIs installate</translation> </message> @@ -10405,17 +10405,17 @@ <translation>Premi per compilare le definizioni APIs selezionate</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="299"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="301"/> <source>Compile APIs</source> <translation>Compila APIs</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="238"/> <source>Select from the list of installed API files</source> <translation>Seleziona dalla lista dei file API installati</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="314"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="316"/> <source>Cancel compilation</source> <translation>Cancella compilazione</translation> </message> @@ -10430,17 +10430,17 @@ <translation>Premi per selezionare un file delle API dalla lista di quelli installati dai plugins</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> <source>Add from Plugin APIs</source> <translation>Aggiungi dalle API dei plugin</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> <source>Select from the list of API files installed by plugins</source> <translation>Seleziona dalla lista delle API installate dai plugins</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> <source>There are no APIs installed yet. Selection is not available.</source> <translation>Non sono ancora installate le API. La selezione non è disponibile.</translation> </message> @@ -10612,6 +10612,89 @@ </message> </context> <context> + <name>EditorButtonsWidget</name> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="175"/> + <source>Bold</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="177"/> + <source>Italic</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="179"/> + <source>Strike Through</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="182"/> + <source>Header 1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="184"/> + <source>Header 2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="186"/> + <source>Header 3</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="188"/> + <source>Header</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="193"/> + <source>Inline Code</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="195"/> + <source>Code Block</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="197"/> + <source>Quote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="200"/> + <source>Add Hyperlink</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="202"/> + <source>Add Horizontal Line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="204"/> + <source>Add Image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="207"/> + <source>Add Bulleted List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="209"/> + <source>Add Numbered List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="273"/> + <source>Level {0}</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>EditorCalltipsPage</name> <message> <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="37"/> @@ -11422,7 +11505,7 @@ <translation>Selezione l'analizzatore sintattico alternativo da associare</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightersPage.py" line="142"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightersPage.py" line="146"/> <source>Alternative</source> <translation>Alternativo</translation> </message> @@ -11450,7 +11533,7 @@ <translation>Seleziona il riempimento di fine linea.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> <source>Fill to end of line</source> <translation>Riempi fino a fine linea</translation> </message> @@ -11525,17 +11608,17 @@ <translation>Riempi tutto fino a fine linea</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="351"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="355"/> <source>Enabled</source> <translation>Abilitato</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="352"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="356"/> <source>Disabled</source> <translation>Disabilitato</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> <source>Select fill to end of line for all styles</source> <translation>Seleziona il riempimento fino a fine linea per tutti gli stili</translation> </message> @@ -11595,27 +11678,27 @@ <translation>Esporta tutti gli stili</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465"/> <source>Export Highlighting Styles</source> <translation>Esporta stili di evidenziazione</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="497"/> <source>Import Highlighting Styles</source> <translation>Importa gli stili di evidenziazione</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="477"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="481"/> <source>Highlighting styles file (*.e4h)</source> <translation>Highlighting styles file (*.e4h)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465"/> <source><p>The highlighting styles could not be exported to file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Lo stile di evidenziazione non può essere esportato nel file <b>{0}</b>.</p><p>Motivo: {1}</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="497"/> <source><p>The highlighting styles could not be read from file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Gli stili di evidenziazione non possono essere letti dal file <b>{0}</b>.</p><p>Motivo: {1}</p></translation> </message> @@ -11742,12 +11825,12 @@ <translation>Proprietà analizzatore lessicale della Bash</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1048"/> <source>Select whether folding of comments shall be possible</source> <translation>Selezione quando la compressione dei commenti deve essere possibile</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1051"/> <source>Fold comments</source> <translation>Comprimi commenti</translation> </message> @@ -11777,22 +11860,22 @@ <translation>Indenta la parentesi aperta</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="990"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/> <source>Select whether folding at else statement should be possible</source> <translation>Selezione nel caso la compressione al costrutto else deve essere possibile</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/> <source>Fold at else</source> <translation>Comprimi all'else</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="522"/> <source>Select whether folding of preprocessor directives shall be possible</source> <translation>Selezione nel caso la compressione delle direttive del preprocessore deve essere possibile</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="525"/> <source>Fold preprocessor directives</source> <translation>Comprimi direttive del preprocessore</translation> </message> @@ -11837,127 +11920,127 @@ <translation>Tag case sensitive</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="516"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/> <source>Perl Lexer Properties</source> <translation>Proprietà analizzatore lessicale del Perl</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="637"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/> <source>Povray Lexer Properties</source> <translation>Proprietà analizzatore lessicale di Povray</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="643"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/> <source>Select whether folding of directives shall be possible</source> <translation>Seleziona quando la compressione delle direttive deve essere possibile</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="646"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/> <source>Fold directives</source> <translation>Comprimi direttive</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="685"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> <source>Python Lexer Properties</source> <translation>Proprietà analizzatore lessicale di Python</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="796"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="825"/> <source>Select whether bad indentation shall be highlighted</source> <translation>Seleziona quando una errata indentazione deve essere evidenziata</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="721"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="750"/> <source>Select whether text should be autoindented after a ':'</source> <translation>Seleziona quando un testo deve essere indentato automaticamente dopo i ':'</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="724"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="753"/> <source>Auto indentation after ':'</source> <translation>Indenta automaticamento dopo ':'</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="730"/> <source>Select whether folding of strings shall be possible</source> <translation>Selezione se la compressione delle stringhe deve essere possibile</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="733"/> <source>Fold strings</source> <translation>Comprimi stringhe</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="827"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/> <source>SQL Lexer Properties</source> <translation>Proprietà analizzatore lessicale dell'SQL</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="863"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="892"/> <source>Select to enable Backslash Escapes</source> <translation>Seleziona per abilitare i Backslash Escapes</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="866"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="895"/> <source>Backslash Escapes</source> <translation>Backslash Escapes</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="964"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/> <source>VHDL Lexer Properties</source> <translation>Proprietà analizzatore lessicale di VHDL</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="999"/> <source>Select whether folding of blocks at a parenthesis shall be possible</source> <translation>Selezione se la compressione di blocchi alla parentesi deve essere possibile</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1002"/> <source>Fold at parenthesis</source> <translation>Comprimi alle parentesi</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1009"/> <source>Select whether folding of begin blocks shall be possible</source> <translation>Seleziona se la compressione all'inizio dei blocchi deve essere possibile</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1012"/> <source>Fold at begin</source> <translation>Comprimi all'inizio</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/> <source>Pascal Lexer Properties</source> <translation>Proprietà analizzatore lessicale del Pascal</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="565"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="594"/> <source>PostScript Lexer Properties</source> <translation>Proprietà analizzatore lessicale di PostScript</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="581"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="610"/> <source>Select to mark tokens</source> <translation>Seleziona per marcare i token</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="584"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="613"/> <source>Mark Tokens</source> <translation>Marca i token</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="593"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="622"/> <source>PostScript Level:</source> <translation>PostScript Level:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="600"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="629"/> <source>Select the PostScript level</source> <translation>Selezione il PostScript level</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1013"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1042"/> <source>YAML Lexer Properties</source> <translation>Proprietà analizzatore lessicale di YAML</translation> </message> @@ -12007,62 +12090,62 @@ <translation>Style scripts</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="503"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/> <source>Select to enable smart highlighting of keywords</source> <translation>Seleziona per abilitare l'evidenziazione furba delle parole chiave</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/> - <source>Smart Highlighting</source> - <translation>Evidenziazione furba</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/> - <source>Select to enable folding of Perl packages</source> - <translation>Seleziona per abilitare la compressione dei pacchetti Perl</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="535"/> + <source>Smart Highlighting</source> + <translation>Evidenziazione furba</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="561"/> + <source>Select to enable folding of Perl packages</source> + <translation>Seleziona per abilitare la compressione dei pacchetti Perl</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="564"/> <source>Fold packages</source> <translation>Comprimi packages</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="542"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="571"/> <source>Select to enable folding of Perl POD blocks</source> <translation>Seleziona per abilitare la compressione dei blocchi POD di perl</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="574"/> <source>Fold POD blocks</source> <translation>Comprimi blocchi POD</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="741"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="770"/> <source>Select to allow Python v2 unicode string literals (e.g. u"utf8")</source> <translation>Seleziona per permettere caratteri unicode Python v2 (es. u"utf8")</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="744"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="773"/> <source>Allow v2 unicode string literals</source> <translation>Permetti caratteri unicode v2</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="751"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="780"/> <source>Select to allow Python v3 binary and octal literals (e.g. 0b1011, 0o712)</source> <translation>Seleziona per permettere caratteri binari e ottali Python v3 (es. 0b1011, 0o712)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="754"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/> <source>Allow v3 binary and octal literals</source> <translation>Consenti caratteri binari e ottali v3</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="761"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="790"/> <source>Select to allow Python v3 bytes string literals (e.g. b"bytes")</source> <translation>Seleziona per permettere byte Python v3 (es. b"bytes")</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="764"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="793"/> <source>Allow v3 bytes string literals</source> <translation>Permetti byte unicode v3</translation> </message> @@ -12097,112 +12180,112 @@ <translation>Abilita modelli Mako</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="695"/> <source>Properties Lexer Properties</source> <translation>Proprietà dell'analizzatore lessicale</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/> <source>Select to allow initial spaces in a line</source> <translation>Seleziona per permettere gli spazi iniziali nella riga</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/> <source>Allow initial spaces</source> <translation>Permetti spazi iniziali</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="740"/> <source>Select whether folding of triple quoted strings shall be possible</source> <translation>Seleziona se deve essere possibile la chiusura stringa tra virgolette triple</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="743"/> <source>Fold triple quoted strings</source> <translation>Racchiudi stringhe tra virgolette triple</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="760"/> <source>Select to allow strings to span newline characters</source> <translation>Seleziona per permettere alle stringhe di unire i caratteri a capo</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="734"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="763"/> <source>Strings may span newline characters</source> <translation>Le stringhe possono congiungere i caratteri a capo</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="808"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="837"/> <source>Ruby Lexer Properties</source> <translation>Proprietà dell'analizzatore lessicale Ruby</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="853"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="882"/> <source>Select whether only BEGIN blocks can be folded</source> <translation>Seleziona se i soli blocchi BEGIN possono essere congiunti</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="885"/> <source>Only BEGIN blocks can be folded</source> <translation>Solo i blocchi BEGIN possono venir congiunti</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="873"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="902"/> <source>Select if words may contain dots</source> <translation>Seleziona se le voci possono contenere punti</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="876"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="905"/> <source>Words may contain dots</source> <translation>Le vosi possono contenere punti</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="883"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="912"/> <source>Select to allow '#' as a comment character</source> <translation>Seleziona per consentire '#' come carattere di commento</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="886"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="915"/> <source>Allow '#' as comment character</source> <translation>Consenti '#' come carattere di commento</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="893"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="922"/> <source>Select to enable quoted identifiers</source> <translation>Seleziona per abilitare identificatore tra virgolette</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="896"/> - <source>Enable quoted identifiers</source> - <translation>Abilita identificatori tra virgolette</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="906"/> - <source>TCL Lexer Properties</source> - <translation>Proprietà dell'analizzatore lessicale TCL</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="925"/> - <source>TeX Lexer Properties</source> - <translation>Proprietà dell'analizzatore lessicale TeX</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="941"/> - <source>Select to treat comments as TeX source</source> - <translation>Seleziona per gestire i commenti come sorgenti TeX</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="944"/> - <source>Treat comments as TeX source</source> - <translation>Gestisci i commenti come sorgenti TeX</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="951"/> - <source>Select to treat \if<unknown> as a command</source> - <translation>Seleziona per gestire \if<unknown> come un comando</translation> + <source>Enable quoted identifiers</source> + <translation>Abilita identificatori tra virgolette</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="935"/> + <source>TCL Lexer Properties</source> + <translation>Proprietà dell'analizzatore lessicale TCL</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="954"/> + <source>TeX Lexer Properties</source> + <translation>Proprietà dell'analizzatore lessicale TeX</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/> + <source>Select to treat comments as TeX source</source> + <translation>Seleziona per gestire i commenti come sorgenti TeX</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/> + <source>Treat comments as TeX source</source> + <translation>Gestisci i commenti come sorgenti TeX</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/> + <source>Select to treat \if<unknown> as a command</source> + <translation>Seleziona per gestire \if<unknown> come un comando</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/> <source>Treat \if<unknown> as command</source> <translation>Gestisci \if<unknown> come un comando</translation> </message> @@ -12212,7 +12295,7 @@ <translation>Evidenzia stringhe tra virgolette triple</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="774"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="803"/> <source>Highlight sub-identifiers</source> <translation>Evidenzia sotto-identificatori</translation> </message> @@ -12222,7 +12305,7 @@ <translation>Seleziona per evidenziare stringhe tra virgolette triple</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="771"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="800"/> <source>Select to highlight sub-identifiers defined in keyword set 2</source> <translation>Seleziona per evidenziare i sotto-identificatori definiti nell'insieme 2 di parole-chiave</translation> </message> @@ -12277,32 +12360,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="812"/> <source>Highlight bad indentation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>No Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Inconsistent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Tabs after Spaces</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Spaces</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Tabs</source> <translation type="unfinished">Schede</translation> </message> @@ -12322,7 +12405,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="194"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/> <source>Highlight escape sequences</source> <translation type="unfinished"></translation> </message> @@ -12336,6 +12419,26 @@ <source>Allow verbatim string escape sequences</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/> + <source>JSON</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="483"/> + <source>Select to enable highlighting of line/block comments</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="486"/> + <source>Highlight comments</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/> + <source>Select to enable highlighting of escape sequences in strings</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSearchPage</name> @@ -13480,6 +13583,16 @@ <source>Select the colour for the search marker</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1866"/> + <source>Select to hide the Format Buttons bar when formatting is not supported</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1869"/> + <source>Hide Format Buttons bar when not supported</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSyntaxPage</name> @@ -13745,22 +13858,22 @@ <context> <name>EmailDialog</name> <message> - <location filename="../UI/EmailDialog.py" line="339"/> + <location filename="../UI/EmailDialog.py" line="346"/> <source>Send bug report</source> <translation>Invia un bug report</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="357"/> + <location filename="../UI/EmailDialog.py" line="364"/> <source>Attach file</source> <translation>Allega file</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="293"/> + <location filename="../UI/EmailDialog.py" line="300"/> <source>Mail Server Password</source> <translation>Password del server di posta</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="293"/> + <location filename="../UI/EmailDialog.py" line="300"/> <source>Enter your mail server password</source> <translation>Inserisci la tua password per il server di posta</translation> </message> @@ -13855,12 +13968,12 @@ <translation>Invia una richiesta di funzionalità</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="311"/> + <location filename="../UI/EmailDialog.py" line="318"/> <source><p>Authentication failed.<br>Reason: {0}</p></source> <translation><p>Autenticazione fallita.<br>Motivo: {0}</p></translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="339"/> + <location filename="../UI/EmailDialog.py" line="346"/> <source><p>Message could not be sent.<br>Reason: {0}</p></source> <translation><p>Il messaggio non può essere inviato.<br>Motivo: {0}</p></translation> </message> @@ -13868,17 +13981,17 @@ <context> <name>EmailPage</name> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="183"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="225"/> <source>Enter your password for accessing the mail server</source> <translation>Inserisci la tua password per accedere al server di posta</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="211"/> <source>Enter your mail server username</source> <translation>Inserisci il nome utente utilizzato sul server di posta</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="106"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="170"/> <source>Signature:</source> <translation>Firma:</translation> </message> @@ -13888,37 +14001,37 @@ <translation>Inserisci l'indirizzo del tuo server di posta</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="92"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/> <source>Email address:</source> <translation>Indirizzo Email:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="116"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="180"/> <source>Enter your email signature</source> <translation>Inserisci la tua firma per le mail</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="99"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/> <source>Enter your email address</source> <translation>Inserisci il tuo indirizzo di posta</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="138"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="192"/> <source>Select to authenticatate against the mail server</source> <translation>Seleziona per autenticarti sul serverdi posta</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="141"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="195"/> <source>Mail server needs authentication</source> <translation>Il server di posta richiede l'autenticazione</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="153"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="204"/> <source>Username:</source> <translation>Nome Utente:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="173"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="218"/> <source>Password:</source> <translation>Passoword:</translation> </message> @@ -13928,17 +14041,17 @@ <translation><b>Configura Email</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="128"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="104"/> <source>Select to use TLS</source> <translation>Seleziona per usare TLS</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="131"/> <source>Use TLS</source> - <translation>Usa TLS</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="60"/> + <translation type="obsolete">Usa TLS</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="124"/> <source>Enter the port of the mail server</source> <translation>Inserisci la porta del server di posta</translation> </message> @@ -13950,33 +14063,68 @@ <message> <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/> <source>Outgoing mail server port:</source> - <translation>Porta server di posta in uscita:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="193"/> + <translation type="obsolete">Porta server di posta in uscita:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="235"/> <source>Press to test the login data</source> <translation>Premi per testare i dati di accesso</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="196"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="238"/> <source>Test Login</source> <translation>Testa l'accesso</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/> <source>Login Test</source> <translation>Controllo accesso</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="138"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="204"/> <source>The login test succeeded.</source> <translation>Il controllo d'accesso è corretto.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/> <source><p>The login test failed.<br>Reason: {0}</p></source> <translation><p>Il controllo accesso è fallito.<br>Motivo: {0}</p></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/> + <source>Encryption Method:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="81"/> + <source>Select to use no encryption</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="84"/> + <source>None</source> + <translation type="unfinished">Nessuno</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="94"/> + <source>Select to use SSL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="97"/> + <source>SSL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="107"/> + <source>TLS</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="117"/> + <source>Port:</source> + <translation type="unfinished">Porta:</translation> + </message> </context> <context> <name>EricAccessHandler</name> @@ -14929,7 +15077,7 @@ <context> <name>ExceptionsFilterDialog</name> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="16"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="17"/> <source><b>Exception Filter</b> <p>This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the "Start Debugging" dialog is unchecked, no exception will be reported at all.</p> <p>Please note, that unhandled exceptions are always highlighted independent of these settings.</p></source> @@ -14938,47 +15086,47 @@ <p>Nota che tutte le eccezioni non gestite sono sempre evidenziate indipendentemente da queste impostazioni.</p></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="69"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="64"/> <source>Delete</source> <translation>Cancella</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="52"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="51"/> <source>Enter an exception type that shall be highlighted</source> <translation>Inserisci un tipo di eccezione che deve essere evidenziata</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="27"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="28"/> <source>List of exceptions that shall be highlighted</source> <translation>Lista di eccezioni che devono essere evidenziate</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="42"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="41"/> <source>Press to add the entered exception to the list</source> <translation>Premi per aggiungere l'eccezione inserita alla lista</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="45"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="44"/> <source>Add</source> <translation>Aggiungi</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="66"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="61"/> <source>Press to delete the selected exception from the list</source> <translation>Premi per cancellare l'eccezione selezionata dalla lista</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="13"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="14"/> <source>Exceptions Filter</source> <translation>Filtro eccezioni</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="76"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="71"/> <source>Press to delete all exceptions from the list</source> <translation>Premi per cancellare tutte le eccezioni dalla lista</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="79"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="74"/> <source>Delete All</source> <translation>Cancella tutto</translation> </message> @@ -22118,7 +22266,7 @@ <translation type="obsolete">Il processo hg è terminato con codice di uscita {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1822"/> <source>The hg process did not finish within 30s.</source> <translation>Il processo hg non è finito entro i 30s.</translation> </message> @@ -22173,147 +22321,147 @@ <translation>Rinomino {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012"/> <source>Reverting changes</source> <translation>Annullamento modifiche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1057"/> <source>Merging</source> <translation>Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1359"/> <source>Mercurial command</source> <translation>Comando Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/> <source>Pulling from a remote Mercurial repository</source> <translation>Pulling da un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2022"/> <source>Pushing to a remote Mercurial repository</source> <translation>Pushing in un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230"/> <source>Creating branch in the Mercurial repository</source> <translation>Creazione Branch nel repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verifica dell'integrità del repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403"/> <source>Showing the combined configuration settings</source> <translation>Visualizzazione combinata della impostazioni di configurazione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2427"/> <source>Showing aliases for remote repositories</source> <translation>Visualizzazione degli alias per i repository remoti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2451"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> <source>Shall the working directory be updated?</source> <translation>Le directory di lavoro devono essere aggiornate ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2604"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2730"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2727"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2625"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2475"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2759"/> <source>Removing files from the Mercurial repository only</source> <translation>Rimozione di file dal solo repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2710"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Changegroup Files (*.hg);;All Files (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2623"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2578"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file changegroup di Mercurial<b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -22323,72 +22471,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2959"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source>Remove Sub-repositories</source> <translation type="unfinished">Rimuovi sotto-archivi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -22403,157 +22551,157 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1030"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="997"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Il file <b>{0}</b> non può essere letto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1133"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3614"/> <source>Mercurial Bookmark</source> <translation type="unfinished">Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> <source>Delete Bookmark</source> <translation type="unfinished">Cancella segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished">Seleziona il segnalibro da cancellare:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Cancella Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Rinomina Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Sposta Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Pull Bookmark</source> <translation type="unfinished">Estrai Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished">Seleziona il segnalibro da estrarre:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished">Etrae segnalibro da un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Push Bookmark</source> <translation type="unfinished">Inserisce Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Select the bookmark to be push:</source> <translation type="unfinished">Seleziona il segnalibro da inserire:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3924"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished">Inserisce segnalibro in un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -24898,7 +25046,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> @@ -24928,17 +25076,17 @@ <translation>Seleziona il campo su cui filtrare</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/> <source>Revision</source> <translation>Revisione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> <source>Author</source> <translation>Autore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="103"/> <source>Message</source> <translation>Messaggio</translation> </message> @@ -24963,142 +25111,142 @@ <translation>Tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="285"/> <source>Action</source> <translation>Azione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="290"/> <source>Path</source> <translation>Percorso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="295"/> <source>Copy from</source> <translation>Copia da</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="306"/> <source>Press to get the next bunch of log entries</source> <translation>Premi per predere il prossimo blocco di entry del log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="309"/> <source>&Next</source> <translation>Succ&essivo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="316"/> <source>Enter the limit of entries to fetch</source> <translation>Inserisci il limite degli elementi da scaricare</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="335"/> <source>Select to stop listing log messages at a copy or move</source> <translation>Seleziona per fermare l'ascolto dei messaggi di log al copy o al move</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="338"/> <source>Stop on Copy/Move</source> <translation>Ferma su Copy/Move</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="398"/> <source>Press to compare two revisions</source> <translation>Premi per confrontare due revisioni</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="401"/> <source>&Compare Revisions</source> <translation>&Confronta revisioni</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="462"/> <source>Errors</source> <translation>Errori</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="468"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Log errori Mercurial</b><p>Mostra gli eventuali messaggi di errore del comando hg log.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="484"/> <source>Input</source> <translation>Input</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="474"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="506"/> <source>Press to send the input to the hg process</source> <translation>Premi per spedire l'input al processo hg</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="477"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="509"/> <source>&Send</source> <translation>&Spedisci</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="512"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="519"/> <source>Enter data to be sent to the hg process</source> <translation>Inserisci i dati da inviare al processo hg</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="526"/> <source>Select to switch the input field to password mode</source> <translation>Seleziona per impostare il campo di input in modalità password</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="529"/> <source>&Password Mode</source> <translation>Modo &Password</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="532"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> <source>Added</source> <translation>Aggiunto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169"/> <source>Deleted</source> <translation>Cancellato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source>Modified</source> <translation>Modificato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="993"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="993"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="666"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="747"/> <source>The hg process did not finish within 30s.</source> <translation>Il processo hg non è finito entro i 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="669"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="750"/> <source>Could not start the hg executable.</source> <translation>Non posso avviare l'eseguibile hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="753"/> <source>Mercurial Error</source> <translation>Mercurial Error</translation> </message> @@ -25108,22 +25256,22 @@ <translation>Graph</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="378"/> <source>Press to generate a diff to the first parent revision</source> <translation>Premi per generare un diff con la revisione precedente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="381"/> <source>Diff to Parent &1</source> <translation>Diff con il predecessore &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> <source>Press to generate a diff to the second parent revision</source> <translation>Premi per generare un diff con la seconda revisione precedente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="391"/> <source>Diff to Parent &2</source> <translation>Diff con il predecessore &2</translation> </message> @@ -25138,32 +25286,32 @@ <translation>Seleziona il branch su cui filtrare</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="147"/> <source>All</source> <translation>Tutti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> <source>Mercurial Log (Incoming)</source> <translation>Mercurial Log (Incoming)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="77"/> <source>Mercurial Log (Outgoing)</source> <translation>Mercurial Log (Outgoing)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> <source>Bookmarks</source> <translation type="unfinished">Segnalibri</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="90"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> @@ -25173,83 +25321,83 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="227"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1899"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2091"/> <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/HgLogBrowserDialog.ui" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="444"/> <source>Select to show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="421"/> <source>Select action from menu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> - <source>Tag</source> - <translation type="unfinished">Tag</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="204"/> - <source>Tag the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1773"/> - <source>Switch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="209"/> - <source>Switch the working directory to the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/> + <source>Tag</source> + <translation type="unfinished">Tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="235"/> + <source>Tag the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1951"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="240"/> + <source>Switch the working directory to the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="265"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="983"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1087"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -25274,352 +25422,339 @@ <translation type="unfinished">Premi per trovare la prossima occorrenza</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Find</source> <translation type="unfinished">Trova</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Filter</source> <translation type="unfinished">Filtro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> - <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Tags</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Segnalibri</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2192"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2192"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' non è stato trovato.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174"/> <source>Draft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> <source>Public</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/> <source>Secret</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2049"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="261"/> <source>Pull changes from a remote repository</source> <translation type="unfinished">Pull changes da un repository remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="274"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1852"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2030"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2091"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> <source>Fetch changes from a remote repository</source> <translation type="unfinished">Recupero modifiche da un repository remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="291"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="245"/> <source>Define Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="248"/> <source>Bookmark the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250"/> <source>Move Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253"/> <source>Move bookmark to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1972"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1972"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1816"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1994"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1816"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1994"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1937"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr><tr><td><b>Children</b></td><td>{5}</td></tr>{6}</table></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="368"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> + <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="14"/> <source>Mercurial Log</source> - <translation>Mercurial Log</translation> + <translation type="obsolete">Mercurial Log</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="26"/> <source>Log</source> - <translation>Log</translation> + <translation type="obsolete">Log</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="32"/> <source><b>Mercurial Log</b><p>This shows the output of the hg log command. By clicking on the links you may show the difference between revisions.</p></source> - <translation><b>Log Mercurial</b><p>Mostra l'output del comando hg log.Premendo sul link puoi vedere le differenze tra le versioni.</p></translation> + <translation type="obsolete"><b>Log Mercurial</b><p>Mostra l'output del comando hg log.Premendo sul link puoi vedere le differenze tra le versioni.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="61"/> <source>Errors</source> - <translation>Errori</translation> + <translation type="obsolete">Errori</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="67"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> - <translation><b>Log errori Mercurial</b><p>Mostra gli eventuali messaggi di errore del comando hg log.</p></translation> + <translation type="obsolete"><b>Log errori Mercurial</b><p>Mostra gli eventuali messaggi di errore del comando hg log.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="83"/> <source>Input</source> - <translation>Input</translation> + <translation type="obsolete">Input</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="105"/> <source>Press to send the input to the hg process</source> - <translation>Premi per spedire l'input al processo hg</translation> + <translation type="obsolete">Premi per spedire l'input al processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="108"/> <source>&Send</source> - <translation>&Spedisci</translation> + <translation type="obsolete">&Spedisci</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="111"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="118"/> <source>Enter data to be sent to the hg process</source> - <translation>Inserisci i dati da inviare al processo hg</translation> + <translation type="obsolete">Inserisci i dati da inviare al processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="125"/> <source>Select to switch the input field to password mode</source> - <translation>Seleziona per impostare il campo di input in modalità password</translation> + <translation type="obsolete">Seleziona per impostare il campo di input in modalità password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="128"/> <source>&Password Mode</source> - <translation>Modo &Password</translation> + <translation type="obsolete">Modo &Password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="131"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="64"/> <source><b>Processing your request, please wait...</b></source> - <translation><b>Esecuzione in corso, attendere prego...</b></translation> + <translation type="obsolete"><b>Esecuzione in corso, attendere prego...</b></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="74"/> <source>Revision</source> - <translation>Revisione</translation> + <translation type="obsolete">Revisione</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> <source>Process Generation Error</source> - <translation>Errore Generazione Processo</translation> + <translation type="obsolete">Errore Generazione Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> + <translation type="obsolete">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/> <source>No log available for '{0}'</source> - <translation>Nessun log disponibile per '{0}'</translation> + <translation type="obsolete">Nessun log disponibile per '{0}'</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="344"/> <source>diff to {0}</source> - <translation>diff su {0}</translation> + <translation type="obsolete">diff su {0}</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="358"/> <source>Tags: {0}<br /> </source> - <translation>Tags: {0}<br /> + <translation type="obsolete">Tags: {0}<br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="364"/> <source>Parents: {0}<br /> </source> - <translation>Parents: {0}<br /> + <translation type="obsolete">Parents: {0}<br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="367"/> <source><i>Author: {0}</i><br /> </source> - <translation><i>Autore: {0}</i><br /> + <translation type="obsolete"><i>Autore: {0}</i><br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="371"/> <source><i>Date: {0}, {1}</i><br /> </source> - <translation><i>Data: {0}</i><br /> + <translation type="obsolete"><i>Data: {0}</i><br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="387"/> <source>Added {0}<br /> </source> - <translation>Aggiunti: {0}<br /> + <translation type="obsolete">Aggiunti: {0}<br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="393"/> <source>Modified {0}<br /> </source> - <translation>Modificati {0}<br /> + <translation type="obsolete">Modificati {0}<br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="399"/> <source>Deleted {0}<br /> </source> - <translation>Cancellati {0}<br /> + <translation type="obsolete">Cancellati {0}<br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="270"/> <source>The hg process did not finish within 30s.</source> - <translation>Il processo hg non è finito entro i 30s.</translation> + <translation type="obsolete">Il processo hg non è finito entro i 30s.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> <source>Could not start the hg executable.</source> - <translation>Non posso avviare l'eseguibile hg.</translation> + <translation type="obsolete">Non posso avviare l'eseguibile hg.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="276"/> <source>Mercurial Error</source> - <translation>Mercurial Error</translation> + <translation type="obsolete">Mercurial Error</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="382"/> <source>Added {0} (copied from {1})<br /> </source> - <translation>Aggiunti {0} (copiati da {1})<br /> + <translation type="obsolete">Aggiunti {0} (copiati da {1})<br /> </translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="361"/> - <source>Bookmarks: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="352"/> - <source>Phase: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="45"/> - <source>Select to show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="48"/> - <source>Show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="355"/> - <source>Branch: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>HgMergeDialog</name> @@ -26004,87 +26139,87 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="605"/> <source>Version Control</source> <translation>Controllo di Versione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="617"/> <source>Commit changes to repository...</source> <translation>Committa le modifica nel repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> <source>Add to repository</source> <translation>Aggiungi al repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628"/> <source>Remove from repository (and disk)</source> <translation>Rimuovi dal repository (e dal disco)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="548"/> <source>Show log</source> - <translation>Mostra log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="552"/> + <translation type="obsolete">Mostra log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="544"/> <source>Show log browser</source> <translation>Mostra il browser dei log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> <source>Show status</source> <translation>Mostra stato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="343"/> <source>Show annotated file</source> <translation>Mostra file appuntati</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Revert changes</source> <translation>Annulla modifiche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="663"/> <source>Select all local file entries</source> <translation>Seleziona tutt i file locali</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="665"/> <source>Select all versioned file entries</source> <translation>Seleziona tutti i file controllati</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> <source>Select all local directory entries</source> <translation>Seleziona tutte le directory locali</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="669"/> <source>Select all versioned directory entries</source> <translation>Seleziona tutte le directory controllate</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Remove from repository only</source> <translation>Rimuovi solo dal repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Do you really want to remove these files from the repository?</source> <translation>Vuoi veramente rimuovere questi file dal repository ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="539"/> <source>Copy</source> <translation>Copia</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="541"/> <source>Move</source> <translation>Sposta</translation> </message> @@ -26094,42 +26229,42 @@ <translation>Estensioni</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="639"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="329"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="651"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="643"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="338"/> <source>Show differences side-by-side (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="653"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="656"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="672"/> <source>Configure...</source> <translation type="unfinished">Configura...</translation> </message> @@ -26278,581 +26413,566 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> - <source>Show log</source> - <translation>Mostra log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> - <source>Show &log</source> - <translation>Mostra &log</translation> + <source>Show log browser</source> + <translation>Mostra il browser dei log</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> - <source>Show the log of the local project</source> - <translation>Mostra i log del progetto locale</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation>Mostra un dialogo per navigare i log del progetto locale</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation><b>Mostra log</b><p>Mostra i log del progetto locale.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> - <source>Show log browser</source> - <translation>Mostra il browser dei log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>Mostra un dialogo per navigare i log del progetto locale</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> + <translation type="obsolete"><b>Mostra log</b><p>Mostra i log del progetto locale.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Mostra borwser log</b><p>Mostra un dialogo per navigare i log del progetto locale. Inizialmente viene mostrato un numero limitato di elementi. Altri possono essere scaricati in seguito.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show &difference</source> <translation>Mostra &differenza</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> <source>Show the difference of the local project to the repository</source> <translation>Mostra le differenze tra il progetto locale e il repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Mostra le differenze tra la revisione del progetto e il repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> <source>Show status</source> <translation>Mostra stato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> <source>Show the status of the local project</source> <translation>Mostra lo stato del progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Mostra stato</b><p>Mostra lo stato del progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> <source>Show heads</source> <translation>Mostra head</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Show the heads of the repository</source> <translation>Mostra head del repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Mostra head</b><p>Mostra l'head del repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357"/> <source>Show parents</source> <translation>Mostra predecessori</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Show the parents of the repository</source> <translation>Mostra il predecessori del repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Mostra predecessori</b><p>Mostra i predecessori del repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="371"/> <source>Show tip</source> <translation>Mostra tip</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <source>Show the tip of the repository</source> + <translation>Mostra il tip del repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> + <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> + <translation><b>Mostra tip</b><p>Mostra il tip del repository.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <source>Revert changes</source> + <translation>Annulla modifiche</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <source>Re&vert changes</source> + <translation>In&verti modifiche</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> - <source>Show the tip of the repository</source> - <translation>Mostra il tip del repository</translation> + <source>Revert all changes made to the local project</source> + <translation>Inverti tutte le modifiche fatte al progetto locale</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> - <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> - <translation><b>Mostra tip</b><p>Mostra il tip del repository.</p></translation> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation><b>Inverti modifiche</b><p>Inverte tutte le modifiche fatte al progetto locale.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> - <source>Revert changes</source> - <translation>Annulla modifiche</translation> + <source>Merge</source> + <translation>Fondi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> - <source>Re&vert changes</source> - <translation>In&verti modifiche</translation> + <source>Mer&ge changes...</source> + <translation>Fon&di modifiche...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> - <source>Revert all changes made to the local project</source> - <translation>Inverti tutte le modifiche fatte al progetto locale</translation> + <source>Merge changes of a revision into the local project</source> + <translation>Fondi le modifiche dela revisione nel progetto locale</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation><b>Inverti modifiche</b><p>Inverte tutte le modifiche fatte al progetto locale.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> - <source>Merge</source> - <translation>Fondi</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> - <source>Mer&ge changes...</source> - <translation>Fon&di modifiche...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> - <source>Merge changes of a revision into the local project</source> - <translation>Fondi le modifiche dela revisione nel progetto locale</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Merge</b><p>Fonde le modifiche della revisione nel progetto locale.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <source>Tag in repository</source> + <translation>Tag nel repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <source>&Tag in repository...</source> + <translation>&Tag nel repository...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <source>Tag the local project in the repository</source> + <translation>Tag del progetto locale nel repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Tag nel repository</b><p>Tag del progetto locale nel repository.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> - <source>Tag in repository</source> - <translation>Tag nel repository</translation> + <source>List tags</source> + <translation>Elenca tag</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> - <source>&Tag in repository...</source> - <translation>&Tag nel repository...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> - <source>Tag the local project in the repository</source> - <translation>Tag del progetto locale nel repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Tag nel repository</b><p>Tag del progetto locale nel repository.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> - <source>List tags</source> - <translation>Elenca tag</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags...</source> <translation>Elenca tag...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> <source>List tags of the project</source> <translation>Elenca i tag del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Elenca tag</b><p>Elenca i tag del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>List branches</source> <translation>Elenca branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>List branches...</source> <translation>Elenca branches...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> + <source>List branches of the project</source> + <translation>Elenca i branches del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Elenca branches</b><p>Elenca i branch del progetto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create branch</source> + <translation>Crea Branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create &branch...</source> + <translation>Crea &Branch...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> - <source>List branches of the project</source> - <translation>Elenca i branches del progetto</translation> + <source>Create a new branch for the local project in the repository</source> + <translation>Crea un nuovo branch per il progetto locale nel repository</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Elenca branches</b><p>Elenca i branch del progetto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Create branch</source> - <translation>Crea Branch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Create &branch...</source> - <translation>Crea &Branch...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> - <source>Create a new branch for the local project in the repository</source> - <translation>Crea un nuovo branch per il progetto locale nel repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Crea Branch</b><p>Crea un nuovo branch per il progetto locate nel repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> <source>Close branch</source> <translation>Chiudi branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> <source>Close the current branch of the local project</source> <translation>Chiudi il branch corrente del progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Chiudi branch</b><p>Chiude il branch corrente del progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>Switch</source> <translation>Switch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>S&witch...</source> <translation>S&witch...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <source>Switch the working directory to another revision</source> + <translation>Switch della directory di lavoro ad un'altra revisione</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation><b>Switch</b><p>Switch della directory di lavoro ad un'altra revisione.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Cleanup</source> + <translation>Pulisci</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Cleanu&p</source> + <translation>&Pulisci</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Switch the working directory to another revision</source> - <translation>Switch della directory di lavoro ad un'altra revisione</translation> + <source>Cleanup the local project</source> + <translation>Pulisci il progetto locale</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> - <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> - <translation><b>Switch</b><p>Switch della directory di lavoro ad un'altra revisione.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source>Cleanup</source> - <translation>Pulisci</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source>Cleanu&p</source> - <translation>&Pulisci</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> - <source>Cleanup the local project</source> - <translation>Pulisci il progetto locale</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Pulizia</b><p>Esegue la pulizia del progetto locale.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <source>Execute command</source> + <translation>Esegui comando</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <source>E&xecute command...</source> + <translation>&Esegui comando...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <source>Execute an arbitrary Mercurial command</source> + <translation>Esegui un comando Mercurial arbitrario</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> + <translation><b>Esegui comando</b><p>Apre un dialogo per inserire un comando Mercurial arbitraio.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>Execute command</source> - <translation>Esegui comando</translation> + <source>Configure</source> + <translation>Configura</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>E&xecute command...</source> - <translation>&Esegui comando...</translation> + <source>Configure...</source> + <translation>Configura...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> - <source>Execute an arbitrary Mercurial command</source> - <translation>Esegui un comando Mercurial arbitrario</translation> + <source>Show the configuration dialog with the Mercurial page selected</source> + <translation>Mostra il dialogo di configurazione con la pagina di Mercurial selezionata</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> - <translation><b>Esegui comando</b><p>Apre un dialogo per inserire un comando Mercurial arbitraio.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Configure</source> - <translation>Configura</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Configure...</source> - <translation>Configura...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> - <source>Show the configuration dialog with the Mercurial page selected</source> - <translation>Mostra il dialogo di configurazione con la pagina di Mercurial selezionata</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Configura</b><p>Mostra il dialogo di configurazione con la pagina di Mercurial selezionata.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths</source> <translation>Mostra percorsi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths...</source> <translation>Mostra percorsi...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <source>Show the aliases for remote repositories</source> <translation>Mostra alias per i repository remoti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Mostra percorsi</b><p>Mostra alias per i repository remoti.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository</source> <translation>Verifica repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository...</source> <translation>Verifica repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> <source>Verify the integrity of the repository</source> <translation>Verifica l'integrità del repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Verifica repository</b><p>Verifica l'integrità del repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover</source> <translation>Recover</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover...</source> <translation>Recover...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> <source>Recover from an interrupted transaction</source> <translation>Recupera da una transazione interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Recover</b><p>Recupera da una transazione interrotta.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> <source>Create .hgignore</source> <translation>Crea .hgignore</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <source>Create a .hgignore file with default values</source> + <translation>Crea una file .hgignore con i valori di default</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation><b>Crea .hgignore</b><p>Crea una file .hgignore con i valori di default.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup</source> + <translation>Crea changegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup...</source> + <translation>Crea changegroup...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> - <source>Create a .hgignore file with default values</source> - <translation>Crea una file .hgignore con i valori di default</translation> + <source>Create changegroup file collecting changesets</source> + <translation>Crea un file changegroup che colleziona i changeset</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1793"/> + <source>Apply changegroups</source> + <translation>Applica changegroups</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> + <source>Apply changegroups...</source> + <translation>Applica changegroups...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <source>Apply one or several changegroup files</source> + <translation>Applica una o più file changegroups</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <source>Changegroup Management</source> + <translation>Changegroup Management</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation><b>Crea .hgignore</b><p>Crea una file .hgignore con i valori di default.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> - <source>Create changegroup</source> - <translation>Crea changegroup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> - <source>Create changegroup...</source> - <translation>Crea changegroup...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> - <source>Create changegroup file collecting changesets</source> - <translation>Crea un file changegroup che colleziona i changeset</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1810"/> - <source>Apply changegroups</source> - <translation>Applica changegroups</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> - <source>Apply changegroups...</source> - <translation>Applica changegroups...</translation> + <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> + <translation><b>Crea changegroup</b><p>Crea un file changegroup che colleziona i changeset (hg bundle).</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> + <translation><b>Applica changegroups</b><p>Applica una o più file changegroups generati dall'azione Create changegroup' action (hg unbundle).</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> + <source>Show current branch</source> + <translation>Mostra branch corrente</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Show the current branch of the project</source> + <translation>Mostra il brach corrente del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation><b>Mostra il branch corrente</b><p>Mostra il branch corrente del progetto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <source>Mark as "good"</source> + <translation>Segna come "good"</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> - <source>Apply one or several changegroup files</source> - <translation>Applica una o più file changegroups</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1324"/> - <source>Changegroup Management</source> - <translation>Changegroup Management</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> - <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> - <translation><b>Crea changegroup</b><p>Crea un file changegroup che colleziona i changeset (hg bundle).</p></translation> + <source>Mark a selectable changeset as good</source> + <translation>Segna un chageset selezionabile come good</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> - <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> - <translation><b>Applica changegroups</b><p>Applica una o più file changegroups generati dall'azione Create changegroup' action (hg unbundle).</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> - <source>Show current branch</source> - <translation>Mostra branch corrente</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> - <source>Show the current branch of the project</source> - <translation>Mostra il brach corrente del progetto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation><b>Mostra il branch corrente</b><p>Mostra il branch corrente del progetto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source>Mark as "good"</source> - <translation>Segna come "good"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> - <source>Mark a selectable changeset as good</source> - <translation>Segna un chageset selezionabile come good</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Segna come "good"</b><p>Segna un chageset selezionabile come good.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source>Mark as "bad"</source> <translation>Segna come "bad"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> <source>Mark a selectable changeset as bad</source> <translation>Segna un chageset selezionabile come bad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Segna come bad</b><p>Segna un chageset selezionabile come bad.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <source>Skip</source> <translation>Salta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> <source>Reset</source> <translation>Resetta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> <source>Reset the bisect search data</source> <translation>Reset dei dati di ricerca bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Reset</b><p>Reset dei dati di ricerca bisect.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> <source>Mark as "good"...</source> <translation>Segna come "good"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source>Mark as "bad"...</source> <translation>Segna come "bad"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> <source>Preview changegroup...</source> <translation>Anteprima changegroup...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify</source> <translation>Identify</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify...</source> <translation>Identify...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> <source>Identify the project directory</source> <translation>Identifica la directory del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identify</b><p>Identifica la directory del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Anteprima di un file changegroup contenente una collezione di changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Anteprima changegroup</b><p>Anteprima di un file changegroup contenente una collezione di changeset.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> <source>Back out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> <source>Back out changes of an earlier changeset</source> <translation>Ritiro changeset di un changeset precedente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation></b>Ritiro changeset</b><p>Ritiro changeset di un changeset precedente.</p></translation> </message> @@ -26872,687 +26992,687 @@ <translation><b>Push modifiche (force)</b><p>Esegue il push delle modifche dal repository locale verso uno remoto usando l'opzione 'force'.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> <source>Serve project repository</source> <translation>Servi repository del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> <source>Serve project repository...</source> <translation>Servi repository del progetto...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Serve the project repository</source> <translation>Servi il repository del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Servi repository del progetto</b><p>Rende disponibile il repository del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1300"/> <source>Specials</source> <translation>Speciali</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1627"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1610"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> <source>The project should be reread. Do this now?</source> <translation>Il progetto deve essere riletto. Farlo ora ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Extensions</source> <translation type="unfinished">Estensioni</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <source>Show an editor to edit the repository configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Edit repository configuration</source> + <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Edit repository configuration...</source> + <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> - <source>Show an editor to edit the repository configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1849"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1316"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1869"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Export Patches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <source>Export revisions to patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> - <source>Export Patches</source> + <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> - <source>Export Patches...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1889"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> - <source>Change the phase of revisions</source> + <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> - <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1906"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1393"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/> - <source>Copy Changesets (Continue)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <source>Add</source> + <translation type="unfinished">Aggiungi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <source>Add...</source> + <translation type="unfinished">Aggiungi...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <source>Add a sub-repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Add</source> - <translation type="unfinished">Aggiungi</translation> + <source>Remove</source> + <translation type="unfinished">Rimuovi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Add...</source> - <translation type="unfinished">Aggiungi...</translation> + <source>Remove...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> - <source>Add a sub-repository</source> + <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> - <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> - <source>Remove</source> - <translation type="unfinished">Rimuovi</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> - <source>Remove...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> - <source>Remove sub-repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> + <source>Show &status...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <source>Show Summary</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> - <source>Show &status...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> - <source>Show Summary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show summary...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> <source>Show summary information of the working directory status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> + <source>Cancel uncommitted merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> + <source>Cancel an uncommitted merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> + <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <source>List bookmarks</source> + <translation type="unfinished">Lista i segnalibri</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <source>List bookmarks...</source> + <translation type="unfinished">Lista i segnalibri...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <source>List bookmarks of the project</source> + <translation type="unfinished">Lista i segnalibri del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation type="unfinished"><b>Lista i segnalibri</b><p>Lista i segnalibri del progetto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> + <source>Define bookmark</source> + <translation type="unfinished">Definisci un segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> + <source>Define bookmark...</source> + <translation type="unfinished">Definisci un segnalibro...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> + <source>Define a bookmark for the project</source> + <translation type="unfinished">Definisci un segnalibro per il progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <translation type="unfinished"><b>Definisci un segnalibro</b><p>Definisci un segnalibro per il progetto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> + <source>Delete bookmark</source> + <translation type="unfinished">Cancella segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> + <source>Delete bookmark...</source> + <translation type="unfinished">Cancella segnalibro...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> + <source>Delete a bookmark of the project</source> + <translation type="unfinished">Cancella un segnalibro del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation type="unfinished"><b>Cancella segnalibro</b><p>Cancella un segnalibro del progetto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> + <source>Rename bookmark</source> + <translation type="unfinished">Rinomina segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> + <source>Rename bookmark...</source> + <translation type="unfinished">Rinomina segnalibro...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> + <source>Rename a bookmark of the project</source> + <translation type="unfinished">Rinomina un segnalibro del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation type="unfinished"><b>Rinomina segnalibro</b><p>Rinomina un segnalibro del progetto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> + <source>Move bookmark</source> + <translation type="unfinished">Sposta segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> + <source>Move bookmark...</source> + <translation type="unfinished">Sposta segnalibro...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> + <source>Move a bookmark of the project</source> + <translation type="unfinished">Sposta un segnalibro del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> + <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> + <translation type="unfinished"><b>Sposta segnalibro</b><p>Sposta un segnalibro del progetto ad un altro insieme di modifiche.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> + <source>Show incoming bookmarks</source> + <translation type="unfinished">Mostra i segnalibri entranti</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> + <source>Show a list of incoming bookmarks</source> + <translation type="unfinished">Mostra una lista dei segnalibri entranti</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/> + <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> + <translation type="unfinished"><b>Mostra segnalibri entranti</b><p>Mostra una lista di nuovi segnalibri disponibili nel repository remoto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> + <source>Pull bookmark</source> + <translation type="unfinished">Estrae segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> + <source>Pull a bookmark from a remote repository</source> + <translation type="unfinished">Estrae un segnalibro da un repository remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> + <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> + <translation type="unfinished"><b>Estrae segnalibri</b><p>Estrae un segnalibro da un repository remoto a quello locale.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <source>Show outgoing bookmarks</source> + <translation type="unfinished">Mostra segnalibri uscenti</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> + <source>Show a list of outgoing bookmarks</source> + <translation type="unfinished">Mostra una lista di segnalibri uscenti</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186"/> + <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> + <translation type="unfinished"><b>Mostra segnalibri in uscita</b><p>Mostra una lista di nuovi segnalibri disponibili nel repository locale.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/> + <source>Push bookmark</source> + <translation type="unfinished">Inserisci segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> + <source>Push a bookmark to a remote repository</source> + <translation type="unfinished">Inserisce segnalibro in repository remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/> + <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> + <translation type="unfinished"><b>Inserimento segnalibro</b><p>Inserisce un segnalibro dal repository locale a quello remoto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> + <source>Bookmarks</source> + <translation type="unfinished">Segnalibri</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <source>Tags</source> + <translation type="unfinished">Tags</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> + <source>Branches</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>Cancel uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> - <source>Cancel an uncommitted merge and lose all changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/> - <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>List bookmarks</source> - <translation type="unfinished">Lista i segnalibri</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>List bookmarks...</source> - <translation type="unfinished">Lista i segnalibri...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> - <source>List bookmarks of the project</source> - <translation type="unfinished">Lista i segnalibri del progetto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation type="unfinished"><b>Lista i segnalibri</b><p>Lista i segnalibri del progetto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Define bookmark</source> - <translation type="unfinished">Definisci un segnalibro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Define bookmark...</source> - <translation type="unfinished">Definisci un segnalibro...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> - <source>Define a bookmark for the project</source> - <translation type="unfinished">Definisci un segnalibro per il progetto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation type="unfinished"><b>Definisci un segnalibro</b><p>Definisci un segnalibro per il progetto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Delete bookmark</source> - <translation type="unfinished">Cancella segnalibro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Delete bookmark...</source> - <translation type="unfinished">Cancella segnalibro...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <source>Delete a bookmark of the project</source> - <translation type="unfinished">Cancella un segnalibro del progetto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation type="unfinished"><b>Cancella segnalibro</b><p>Cancella un segnalibro del progetto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Rename bookmark</source> - <translation type="unfinished">Rinomina segnalibro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Rename bookmark...</source> - <translation type="unfinished">Rinomina segnalibro...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> - <source>Rename a bookmark of the project</source> - <translation type="unfinished">Rinomina un segnalibro del progetto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation type="unfinished"><b>Rinomina segnalibro</b><p>Rinomina un segnalibro del progetto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source>Move bookmark</source> - <translation type="unfinished">Sposta segnalibro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source>Move bookmark...</source> - <translation type="unfinished">Sposta segnalibro...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> - <source>Move a bookmark of the project</source> - <translation type="unfinished">Sposta un segnalibro del progetto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> - <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> - <translation type="unfinished"><b>Sposta segnalibro</b><p>Sposta un segnalibro del progetto ad un altro insieme di modifiche.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1144"/> - <source>Show incoming bookmarks</source> - <translation type="unfinished">Mostra i segnalibri entranti</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> - <source>Show a list of incoming bookmarks</source> - <translation type="unfinished">Mostra una lista dei segnalibri entranti</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152"/> - <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> - <translation type="unfinished"><b>Mostra segnalibri entranti</b><p>Mostra una lista di nuovi segnalibri disponibili nel repository remoto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> - <source>Pull bookmark</source> - <translation type="unfinished">Estrae segnalibro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> - <source>Pull a bookmark from a remote repository</source> - <translation type="unfinished">Estrae un segnalibro da un repository remoto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> - <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> - <translation type="unfinished"><b>Estrae segnalibri</b><p>Estrae un segnalibro da un repository remoto a quello locale.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> - <source>Show outgoing bookmarks</source> - <translation type="unfinished">Mostra segnalibri uscenti</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/> - <source>Show a list of outgoing bookmarks</source> - <translation type="unfinished">Mostra una lista di segnalibri uscenti</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> - <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> - <translation type="unfinished"><b>Mostra segnalibri in uscita</b><p>Mostra una lista di nuovi segnalibri disponibili nel repository locale.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> - <source>Push bookmark</source> - <translation type="unfinished">Inserisci segnalibro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> - <source>Push a bookmark to a remote repository</source> - <translation type="unfinished">Inserisce segnalibro in repository remoto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> - <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> - <translation type="unfinished"><b>Inserimento segnalibro</b><p>Inserisce un segnalibro dal repository locale a quello remoto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361"/> - <source>Bookmarks</source> - <translation type="unfinished">Segnalibri</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345"/> - <source>Tags</source> - <translation type="unfinished">Tags</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> - <source>Branches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <source>Re-Merge all conflicting, unresolved files of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> - <source>Re-Merge all conflicting, unresolved files of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Show conflicts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Show conflicts...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> - <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> - <source>Conflicts unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> - <source>Mark all conflicts of the local project as unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> - <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> - <source>Manage Changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> + <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <source>Mark all conflicts of the local project as unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> + <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> + <source>Manage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>Mercurial</source> <translation type="unfinished">Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> @@ -30629,6 +30749,42 @@ </message> </context> <context> + <name>HtmlProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/HtmlProvider.py" line="388"/> + <source>Create List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HtmlProvider.py" line="388"/> + <source>Enter desired number of list elements:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HyperlinkMarkupDialog</name> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="14"/> + <source>Insert Hyperlink</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="23"/> + <source>Link Text:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="33"/> + <source>Link Target:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="43"/> + <source>Link Title:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>IExplorerImporter</name> <message> <location filename="../WebBrowser/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="40"/> @@ -30830,1065 +30986,1090 @@ <translation>Windows Bitmap File (*.bmp)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="128"/> + <location filename="../IconEditor/IconEditorWindow.py" line="130"/> <source>Graphic Interchange Format File (*.gif)</source> <translation>Graphic Interchange Format File (*.gif)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="129"/> + <location filename="../IconEditor/IconEditorWindow.py" line="132"/> <source>Windows Icon File (*.ico)</source> <translation>Windows Icon File (*.ico)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="130"/> + <location filename="../IconEditor/IconEditorWindow.py" line="134"/> <source>JPEG File (*.jpg)</source> <translation>JPEG File (*.jpg)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="133"/> - <source>Portable Bitmap File (*.pbm)</source> - <translation>Portable Bitmap File (*.pbm)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="135"/> - <source>Portable Graymap File (*.pgm)</source> - <translation>Portable Graymap File (*.pgm)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="136"/> - <source>Portable Network Graphics File (*.png)</source> - <translation>Portable Network Graphics File (*.png)</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="137"/> - <source>Portable Pixmap File (*.ppm)</source> - <translation>Portable Pixmap File (*.ppm)</translation> + <source>Portable Bitmap File (*.pbm)</source> + <translation>Portable Bitmap File (*.pbm)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="139"/> - <source>Scalable Vector Graphics File (*.svg)</source> - <translation>Scalable Vector Graphics File (*.svg)</translation> + <source>Portable Graymap File (*.pgm)</source> + <translation>Portable Graymap File (*.pgm)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="140"/> + <source>Portable Network Graphics File (*.png)</source> + <translation>Portable Network Graphics File (*.png)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="141"/> + <source>Portable Pixmap File (*.ppm)</source> + <translation>Portable Pixmap File (*.ppm)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="143"/> - <source>TIFF File (*.tif)</source> - <translation>TIFF File (*.tif)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="146"/> - <source>X11 Bitmap File (*.xbm)</source> - <translation>X11 Bitmap File (*.xbm)</translation> + <source>Scalable Vector Graphics File (*.svg)</source> + <translation>Scalable Vector Graphics File (*.svg)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="147"/> + <source>TIFF File (*.tif)</source> + <translation>TIFF File (*.tif)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="151"/> + <source>X11 Bitmap File (*.xbm)</source> + <translation>X11 Bitmap File (*.xbm)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="152"/> <source>X11 Pixmap File (*.xpm)</source> <translation>X11 Pixmap File (*.xpm)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="158"/> + <location filename="../IconEditor/IconEditorWindow.py" line="163"/> <source>All Files (*)</source> <translation>Tutti i file (*)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>New</source> <translation>Nuovo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>&New</source> <translation>&Nuova</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>Ctrl+N</source> <comment>File|New</comment> <translation>Ctrl+N</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="196"/> + <location filename="../IconEditor/IconEditorWindow.py" line="201"/> <source>Create a new icon</source> <translation>Crea una nuova icona</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="197"/> + <location filename="../IconEditor/IconEditorWindow.py" line="202"/> <source><b>New</b><p>This creates a new icon.</p></source> <translation><b>Nuova</b><p>Crea una nuova icona.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="204"/> + <location filename="../IconEditor/IconEditorWindow.py" line="209"/> <source>New Window</source> <translation>Nuova finestra</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="204"/> - <source>New &Window</source> - <translation>Nuova &Finestra</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="209"/> + <source>New &Window</source> + <translation>Nuova &Finestra</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="214"/> <source>Open a new icon editor window</source> <translation>Apri una nuova finestra dell'editor di icone</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="211"/> + <location filename="../IconEditor/IconEditorWindow.py" line="216"/> <source><b>New Window</b><p>This opens a new icon editor window.</p></source> <translation><b>Nuova finestra</b><p>Apre una nuova finestra dell'editor di icone.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>Open</source> <translation>Apri</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>&Open...</source> <translation>&Apri...</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>Ctrl+O</source> <comment>File|Open</comment> <translation>Ctrl+O</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="224"/> + <location filename="../IconEditor/IconEditorWindow.py" line="229"/> <source>Open an icon file for editing</source> <translation>Apri un file icona per la modifica</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="225"/> + <location filename="../IconEditor/IconEditorWindow.py" line="230"/> <source><b>Open File</b><p>This opens a new icon file for editing. It pops up a file selection dialog.</p></source> <translation><b>Apri file</b><p>Apre un nuovo file icona per la modifica. Apre un dialogo per selezionare il fiel.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>Save</source> <translation>Salva</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>&Save</source> <translation>&Salva</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>Ctrl+S</source> <comment>File|Save</comment> <translation>Ctrl+S</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="239"/> + <location filename="../IconEditor/IconEditorWindow.py" line="244"/> <source>Save the current icon</source> <translation>Salva l'icona corrente</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="240"/> + <location filename="../IconEditor/IconEditorWindow.py" line="245"/> <source><b>Save File</b><p>Save the contents of the icon editor window.</p></source> <translation><b>Save File</b><p>Salva il contenuto della finestra dell'editor di icone.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Save As</source> <translation>Salva come</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Save &As...</source> <translation>S&alva come...</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Shift+Ctrl+S</source> <comment>File|Save As</comment> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="253"/> + <location filename="../IconEditor/IconEditorWindow.py" line="258"/> <source>Save the current icon to a new file</source> <translation>Salva l'icona corrente in un nuovo file</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="255"/> + <location filename="../IconEditor/IconEditorWindow.py" line="260"/> <source><b>Save As...</b><p>Saves the current icon to a new file.</p></source> <translation><b>Salva come </b><p>Salva l'icona corrente in un nuovo file.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>Close</source> <translation>Chiudi</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>&Close</source> <translation>&Chiudi</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>Ctrl+W</source> <comment>File|Close</comment> <translation>Ctrl+W</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="268"/> + <location filename="../IconEditor/IconEditorWindow.py" line="273"/> <source>Close the current icon editor window</source> <translation>Chiudi la finestra corrente dell'editor di icone</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="270"/> + <location filename="../IconEditor/IconEditorWindow.py" line="275"/> <source><b>Close</b><p>Closes the current icon editor window.</p></source> <translation><b>Chiudi</b><p>Chiudi la finestra corrente dell'editor di icone.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="277"/> + <location filename="../IconEditor/IconEditorWindow.py" line="282"/> <source>Close All</source> <translation>Chiudi tutti</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="277"/> + <location filename="../IconEditor/IconEditorWindow.py" line="282"/> <source>Close &All</source> <translation>Chiudi &tutti</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="281"/> + <location filename="../IconEditor/IconEditorWindow.py" line="286"/> <source>Close all icon editor windows</source> <translation>Chiudi tutte le finestre dell'editor di icone</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="283"/> + <location filename="../IconEditor/IconEditorWindow.py" line="288"/> <source><b>Close All</b><p>Closes all icon editor windows except the first one.</p></source> <translation><b>Chiudi tutti</b><p>Chiudi tutte le finestre dell'editor di icone esclusa la prima.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>Quit</source> <translation>Esci</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>&Quit</source> <translation>&Esci</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>Ctrl+Q</source> <comment>File|Quit</comment> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="309"/> + <location filename="../IconEditor/IconEditorWindow.py" line="314"/> <source>Quit the icon editor</source> <translation>Esci dell'editor di icone</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="310"/> + <location filename="../IconEditor/IconEditorWindow.py" line="315"/> <source><b>Quit</b><p>Quit the icon editor.</p></source> <translation><b>Esci</b><p>Esci dall'editor di icone.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Undo</source> <translation>Undo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>&Undo</source> <translation>&Undo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Ctrl+Z</source> <comment>Edit|Undo</comment> <translation>Ctrl+Z</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Alt+Backspace</source> <comment>Edit|Undo</comment> <translation>Alt+Backspace</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="329"/> + <location filename="../IconEditor/IconEditorWindow.py" line="334"/> <source>Undo the last change</source> <translation>Annulla l'ultima modifica</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="330"/> + <location filename="../IconEditor/IconEditorWindow.py" line="335"/> <source><b>Undo</b><p>Undo the last change done.</p></source> <translation><b>Annulla</b><p>Annulla l'ultima modifica fatta.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>Redo</source> <translation>Rifai</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>&Redo</source> <translation>&Rifai</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>Ctrl+Shift+Z</source> <comment>Edit|Redo</comment> <translation>Ctrl+Shift+Z</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="343"/> + <location filename="../IconEditor/IconEditorWindow.py" line="348"/> <source>Redo the last change</source> <translation>Rifai ultima modifica</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="344"/> + <location filename="../IconEditor/IconEditorWindow.py" line="349"/> <source><b>Redo</b><p>Redo the last change done.</p></source> <translation><b>Rifai</b><p>Rifai l'ultima modifica fatta.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Cut</source> <translation>Taglia</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Cu&t</source> <translation>&Taglia</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Ctrl+X</source> <comment>Edit|Cut</comment> <translation>Ctrl+X</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Shift+Del</source> <comment>Edit|Cut</comment> <translation>Shift+Del</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="358"/> + <location filename="../IconEditor/IconEditorWindow.py" line="363"/> <source>Cut the selection</source> <translation>Taglia la selezione</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="359"/> + <location filename="../IconEditor/IconEditorWindow.py" line="364"/> <source><b>Cut</b><p>Cut the selected image area to the clipboard.</p></source> <translation><b>Taglia</b><p>Taglia l'area selezionata dell'immagine nella clipboard.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Copy</source> <translation>Copia</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>&Copy</source> <translation>&Copia</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Ctrl+C</source> <comment>Edit|Copy</comment> <translation>Ctrl+C</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Ctrl+Ins</source> <comment>Edit|Copy</comment> <translation>Ctrl+Ins</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="373"/> + <location filename="../IconEditor/IconEditorWindow.py" line="378"/> <source>Copy the selection</source> <translation>Copia la selezione</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="374"/> + <location filename="../IconEditor/IconEditorWindow.py" line="379"/> <source><b>Copy</b><p>Copy the selected image area to the clipboard.</p></source> <translation><b>Copia</b><p>Copia l'area selezionata dell'immagine nella clipboard.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Paste</source> <translation>Incolla</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>&Paste</source> <translation>&Incolla</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Ctrl+V</source> <comment>Edit|Paste</comment> <translation>Ctrl+V</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Shift+Ins</source> <comment>Edit|Paste</comment> <translation>Shift+Ins</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="388"/> + <location filename="../IconEditor/IconEditorWindow.py" line="393"/> <source>Paste the clipboard image</source> <translation>Incolla l'immagine nella clipboard</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="389"/> + <location filename="../IconEditor/IconEditorWindow.py" line="394"/> <source><b>Paste</b><p>Paste the clipboard image.</p></source> <translation><b>Incolla</b><p>Incolla l'immagine dalla clipboard.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="396"/> + <location filename="../IconEditor/IconEditorWindow.py" line="401"/> <source>Paste as New</source> <translation>Incolla come nuova</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="396"/> + <location filename="../IconEditor/IconEditorWindow.py" line="401"/> <source>Paste as &New</source> <translation>Incolla come &Nuova</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="400"/> + <location filename="../IconEditor/IconEditorWindow.py" line="405"/> <source>Paste the clipboard image replacing the current one</source> <translation>Incolla l'immagine dalla clipboard sostituendo l'attuale</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="402"/> + <location filename="../IconEditor/IconEditorWindow.py" line="407"/> <source><b>Paste as New</b><p>Paste the clipboard image replacing the current one.</p></source> <translation><b>Incolla come nuova</b><p>Incolla l'immagine della clipboard sostituendo l'attuale.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Clear</source> <translation>Pulisci</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Cl&ear</source> <translation>Pu&lisci</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Alt+Shift+C</source> <comment>Edit|Clear</comment> <translation>Alt+Shift+C</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="416"/> + <location filename="../IconEditor/IconEditorWindow.py" line="421"/> <source>Clear the icon image</source> <translation>Pulisci l'immagine dell'icona</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="417"/> + <location filename="../IconEditor/IconEditorWindow.py" line="422"/> <source><b>Clear</b><p>Clear the icon image and set it to be completely transparent.</p></source> <translation><b>Pulisci</b><p>Pulisci l'immagine dell'icona e impostala per essere completamente trasparente.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>Select All</source> <translation>Seleziona tutti</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>&Select All</source> <translation>&Seleziona tutto</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>Ctrl+A</source> <comment>Edit|Select All</comment> <translation>Ctrl+A</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="431"/> + <location filename="../IconEditor/IconEditorWindow.py" line="436"/> <source>Select the complete icon image</source> <translation>Seleziona l'immagine icona completa</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="433"/> + <location filename="../IconEditor/IconEditorWindow.py" line="438"/> <source><b>Select All</b><p>Selects the complete icon image.</p></source> <translation><b>Seleziona tutto</b><p>Selezione l'immagine icona completa.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="440"/> + <location filename="../IconEditor/IconEditorWindow.py" line="445"/> <source>Change Size</source> <translation>Cambia dimensione</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="440"/> + <location filename="../IconEditor/IconEditorWindow.py" line="445"/> <source>Change Si&ze...</source> <translation>Cambia Dimen&sione...</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="446"/> + <location filename="../IconEditor/IconEditorWindow.py" line="451"/> <source>Change the icon size</source> <translation>Cambia la dimensione dell'icona</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="447"/> + <location filename="../IconEditor/IconEditorWindow.py" line="452"/> <source><b>Change Size...</b><p>Changes the icon size.</p></source> <translation><b>Cambia dimensione...</b><p>Cambia la dimensione dell'icona.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="454"/> + <location filename="../IconEditor/IconEditorWindow.py" line="459"/> <source>Grayscale</source> <translation>Scala di grigio</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="454"/> + <location filename="../IconEditor/IconEditorWindow.py" line="459"/> <source>&Grayscale</source> <translation>Scala di &grigio</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="460"/> + <location filename="../IconEditor/IconEditorWindow.py" line="465"/> <source>Change the icon to grayscale</source> <translation>Cambia l'icona a scala di grigio</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="462"/> + <location filename="../IconEditor/IconEditorWindow.py" line="467"/> <source><b>Grayscale</b><p>Changes the icon to grayscale.</p></source> <translation><b>Scala di grigio</b><p>Cambia l'icona a scala di grigio.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Zoom in</source> <translation>Ingrandisci</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Zoom &in</source> <translation>Ingrand&isci</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Ctrl++</source> <comment>View|Zoom in</comment> <translation>Ctrl++</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="497"/> + <location filename="../IconEditor/IconEditorWindow.py" line="502"/> <source>Zoom in on the icon</source> <translation>Ingrandisci l'icona</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="498"/> + <location filename="../IconEditor/IconEditorWindow.py" line="503"/> <source><b>Zoom in</b><p>Zoom in on the icon. This makes the grid bigger.</p></source> <translation><b>Ingrandisci</b><p>Ingrandisci l'icona. Rende la griglia più grande.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Zoom out</source> <translation>Riduci</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Zoom &out</source> <translation>&Riduci</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Ctrl+-</source> <comment>View|Zoom out</comment> <translation>Ctrl+-</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="511"/> + <location filename="../IconEditor/IconEditorWindow.py" line="516"/> <source>Zoom out on the icon</source> <translation>Riduci icona</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="512"/> + <location filename="../IconEditor/IconEditorWindow.py" line="517"/> <source><b>Zoom out</b><p>Zoom out on the icon. This makes the grid smaller.</p></source> <translation><b>Riduci</b><p>Riduce l'icona. Rende la griglia più piccola.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Zoom reset</source> <translation>Reset zoom</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Zoom &reset</source> <translation>&Reset zoom</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Ctrl+0</source> <comment>View|Zoom reset</comment> <translation>Ctrl+0</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="535"/> + <location filename="../IconEditor/IconEditorWindow.py" line="540"/> <source>Show Grid</source> <translation>Mostra griglia</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="535"/> + <location filename="../IconEditor/IconEditorWindow.py" line="540"/> <source>Show &Grid</source> <translation>Mostra &Griglia</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="541"/> + <location filename="../IconEditor/IconEditorWindow.py" line="546"/> <source>Toggle the display of the grid</source> <translation>Inverti la visualizzazione della griglia</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="543"/> + <location filename="../IconEditor/IconEditorWindow.py" line="548"/> <source><b>Show Grid</b><p>Toggle the display of the grid.</p></source> <translation><b>Mostra griglia</b><p>Inverte la visualizzazione della griglia.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="562"/> + <location filename="../IconEditor/IconEditorWindow.py" line="567"/> <source>Freehand</source> <translation>Mano libera</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="562"/> + <location filename="../IconEditor/IconEditorWindow.py" line="567"/> <source>&Freehand</source> <translation>&Mano libera</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="568"/> + <location filename="../IconEditor/IconEditorWindow.py" line="573"/> <source><b>Free hand</b><p>Draws non linear lines.</p></source> <translation><b>Mano libera</b><p>Disegna linee non rette.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="577"/> + <location filename="../IconEditor/IconEditorWindow.py" line="582"/> <source>Color Picker</source> <translation>Selezionatore colore</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="577"/> + <location filename="../IconEditor/IconEditorWindow.py" line="582"/> <source>&Color Picker</source> <translation>Selezionatore &Colore</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="583"/> + <location filename="../IconEditor/IconEditorWindow.py" line="588"/> <source><b>Color Picker</b><p>The color of the pixel clicked on will become the current draw color.</p></source> <translation><b>Selezionatore colore</b><p>Il colore del pixel clickato diventerà il colore di disegno corrente.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="594"/> + <location filename="../IconEditor/IconEditorWindow.py" line="599"/> <source>Rectangle</source> <translation>Rettangolo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="594"/> + <location filename="../IconEditor/IconEditorWindow.py" line="599"/> <source>&Rectangle</source> <translation>&Rettangolo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="600"/> + <location filename="../IconEditor/IconEditorWindow.py" line="605"/> <source><b>Rectangle</b><p>Draw a rectangle.</p></source> <translation><b>Rettangolo</b><p>Disegna un rettangolo.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="609"/> + <location filename="../IconEditor/IconEditorWindow.py" line="614"/> <source>Filled Rectangle</source> <translation>Rettangolo pieno</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="609"/> + <location filename="../IconEditor/IconEditorWindow.py" line="614"/> <source>F&illed Rectangle</source> <translation>Rettangolo p&ieno</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="615"/> + <location filename="../IconEditor/IconEditorWindow.py" line="620"/> <source><b>Filled Rectangle</b><p>Draw a filled rectangle.</p></source> <translation><b>Rettangolo pieno</b><p>Disegna un rettangolo pieno.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="625"/> + <location filename="../IconEditor/IconEditorWindow.py" line="630"/> <source>Circle</source> <translation>Circonferenza</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="631"/> + <location filename="../IconEditor/IconEditorWindow.py" line="636"/> <source><b>Circle</b><p>Draw a circle.</p></source> <translation><b>Circonferenza</b><p>Disegna una circonferenza.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="640"/> + <location filename="../IconEditor/IconEditorWindow.py" line="645"/> <source>Filled Circle</source> <translation>Circonferenza piena</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="640"/> + <location filename="../IconEditor/IconEditorWindow.py" line="645"/> <source>Fille&d Circle</source> <translation>Circonfernza &Piena</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="646"/> + <location filename="../IconEditor/IconEditorWindow.py" line="651"/> <source><b>Filled Circle</b><p>Draw a filled circle.</p></source> <translation><b>Circonferenza piena</b><p>Disegna una circonferenza piena.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="656"/> + <location filename="../IconEditor/IconEditorWindow.py" line="661"/> <source>Ellipse</source> <translation>Ellisse</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="656"/> + <location filename="../IconEditor/IconEditorWindow.py" line="661"/> <source>&Ellipse</source> <translation>&Ellisse</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="662"/> + <location filename="../IconEditor/IconEditorWindow.py" line="667"/> <source><b>Ellipse</b><p>Draw an ellipse.</p></source> <translation><b>Ellisse</b><p>Disegna un'ellisse.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="671"/> + <location filename="../IconEditor/IconEditorWindow.py" line="676"/> <source>Filled Ellipse</source> <translation>Ellisse piena</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="671"/> + <location filename="../IconEditor/IconEditorWindow.py" line="676"/> <source>Fille&d Elli&pse</source> <translation>Ellisse &piena</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="677"/> + <location filename="../IconEditor/IconEditorWindow.py" line="682"/> <source><b>Filled Ellipse</b><p>Draw a filled ellipse.</p></source> <translation><b>Ellisse piena</b><p>Disegna una ellisse piena.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="687"/> + <location filename="../IconEditor/IconEditorWindow.py" line="692"/> <source>Flood Fill</source> <translation>Flood Fill</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="687"/> + <location filename="../IconEditor/IconEditorWindow.py" line="692"/> <source>Fl&ood Fill</source> <translation>Fl&ood Fill</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="693"/> + <location filename="../IconEditor/IconEditorWindow.py" line="698"/> <source><b>Flood Fill</b><p>Fill adjoining pixels with the same color with the current color.</p></source> <translation><b>Flood Fill</b><p>Colora i pixel adiacenti dello stesso colore con il colore corrente.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="703"/> + <location filename="../IconEditor/IconEditorWindow.py" line="708"/> <source>Line</source> <translation>Linea</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="703"/> + <location filename="../IconEditor/IconEditorWindow.py" line="708"/> <source>&Line</source> <translation>&Linea</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="709"/> + <location filename="../IconEditor/IconEditorWindow.py" line="714"/> <source><b>Line</b><p>Draw a line.</p></source> <translation><b>Linea</b><p>Disegna una linea.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="718"/> + <location filename="../IconEditor/IconEditorWindow.py" line="723"/> <source>Eraser (Transparent)</source> <translation>Cancellino (Trasparente)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="718"/> + <location filename="../IconEditor/IconEditorWindow.py" line="723"/> <source>Eraser (&Transparent)</source> <translation>Cancellino (&Trasparente)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="724"/> + <location filename="../IconEditor/IconEditorWindow.py" line="729"/> <source><b>Eraser (Transparent)</b><p>Erase pixels by setting them to transparent.</p></source> <translation><b>Cancellino (Trasparente)</b><p>Cancella i pixel mettondoli a trasparente.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="733"/> + <location filename="../IconEditor/IconEditorWindow.py" line="738"/> <source>Rectangular Selection</source> <translation>Selezione rettangolare</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="750"/> + <location filename="../IconEditor/IconEditorWindow.py" line="755"/> <source>Rect&angular Selection</source> <translation>Selezione rett&angolare</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="739"/> + <location filename="../IconEditor/IconEditorWindow.py" line="744"/> <source><b>Rectangular Selection</b><p>Select a rectangular section of the icon using the mouse.</p></source> <translation><b>Selezione rettangolare</b><p>Seleziona una sezione rettangolare dell'icona usando il mouse.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="750"/> + <location filename="../IconEditor/IconEditorWindow.py" line="755"/> <source>Circular Selection</source> <translation>Selezione circolare</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="756"/> + <location filename="../IconEditor/IconEditorWindow.py" line="761"/> <source><b>Circular Selection</b><p>Select a circular section of the icon using the mouse.</p></source> <translation><b>Selezione circolare</b><p>Seleziona una sezione circolare dell'icona usando il mouse.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="773"/> + <location filename="../IconEditor/IconEditorWindow.py" line="778"/> <source>About</source> <translation>About</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="773"/> + <location filename="../IconEditor/IconEditorWindow.py" line="778"/> <source>&About</source> <translation>&About</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="777"/> + <location filename="../IconEditor/IconEditorWindow.py" line="782"/> <source>Display information about this software</source> <translation>Mostra informazioni su questo software</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="779"/> + <location filename="../IconEditor/IconEditorWindow.py" line="784"/> <source><b>About</b><p>Display some information about this software.</p></source> <translation><b>About</b><p>Mostra alcune informazioni su questo software.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="785"/> + <location filename="../IconEditor/IconEditorWindow.py" line="790"/> <source>About Qt</source> <translation>About Qt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="785"/> + <location filename="../IconEditor/IconEditorWindow.py" line="790"/> <source>About &Qt</source> <translation>About &Qt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="789"/> + <location filename="../IconEditor/IconEditorWindow.py" line="794"/> <source>Display information about the Qt toolkit</source> <translation>Mostra informazioni sulla libreria Qt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="791"/> + <location filename="../IconEditor/IconEditorWindow.py" line="796"/> <source><b>About Qt</b><p>Display some information about the Qt toolkit.</p></source> <translation><b>About Qt</b><p>Mostra delle informazioni sulle librerie Qt.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>What's This?</source> <translation>Cos'è questo ?</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>&What's This?</source> <translation>C&os'è Questo ?</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>Shift+F1</source> <comment>Help|What's This?'</comment> <translation>Shift+F1</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="804"/> + <location filename="../IconEditor/IconEditorWindow.py" line="809"/> <source>Context sensitive help</source> <translation>Help sensibile al contesto</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="805"/> + <location filename="../IconEditor/IconEditorWindow.py" line="810"/> <source><b>Display context sensitive help</b><p>In What's This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.</p></source> <translation><b>Mostra help sensibile al contesto</b><p>In modalità What's This?, il cursore del mouse mostra una freccia con un punto di domanda ed è possibile premdere sugli elementi dell'interfaccia per avere una breve descrizione di cosa fanno e di come usarli. Nei dialoghi questa funzionalità può essere utilizzata tramite il pulsante di help sensibile al contesto nella barra del titolo.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="822"/> + <location filename="../IconEditor/IconEditorWindow.py" line="827"/> <source>&File</source> <translation>&File</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="839"/> + <location filename="../IconEditor/IconEditorWindow.py" line="844"/> <source>&Edit</source> <translation>&Edita</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="855"/> + <location filename="../IconEditor/IconEditorWindow.py" line="860"/> <source>&View</source> <translation>&Visualizza</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="863"/> + <location filename="../IconEditor/IconEditorWindow.py" line="868"/> <source>&Tools</source> <translation>&Tools</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="882"/> + <location filename="../IconEditor/IconEditorWindow.py" line="887"/> <source>&Help</source> <translation>&Help</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="892"/> + <location filename="../IconEditor/IconEditorWindow.py" line="897"/> <source>File</source> <translation>File</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="906"/> + <location filename="../IconEditor/IconEditorWindow.py" line="911"/> <source>Edit</source> <translation>Modifica</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="919"/> - <source>View</source> - <translation>Visualizza</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="924"/> + <source>View</source> + <translation>Visualizza</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="929"/> <source>Tools</source> <translation>Tools</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="942"/> + <location filename="../IconEditor/IconEditorWindow.py" line="947"/> <source>Help</source> <translation>Aiuto</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="956"/> + <location filename="../IconEditor/IconEditorWindow.py" line="961"/> <source><p>This part of the status bar displays the icon size.</p></source> <translation><p>Questa parte della barra di stato mostra le dimensioni dell'icona.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="963"/> + <location filename="../IconEditor/IconEditorWindow.py" line="968"/> <source><p>This part of the status bar displays the cursor position.</p></source> <translation><p>Questa parte della barra di stato mostra la posizione del cursore.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1059"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1064"/> <source>Open icon file</source> <translation>Apri file icona</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1109"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1114"/> <source>Save icon file</source> <translation>Salva file icona</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1198"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1203"/> <source>Icon saved</source> <translation>Icona salvata</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1213"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1218"/> <source>Untitled</source> <translation>Senza titolo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1217"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1222"/> <source>Icon Editor</source> <translation>Editor di icone</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="132"/> + <location filename="../IconEditor/IconEditorWindow.py" line="136"/> <source>Multiple-Image Network Graphics File (*.mng)</source> <translation>Multiple-Image Network Graphics File (*.mng)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="525"/> + <location filename="../IconEditor/IconEditorWindow.py" line="530"/> <source>Reset the zoom of the icon</source> <translation>Reset dello zoom dell'icona</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="527"/> + <location filename="../IconEditor/IconEditorWindow.py" line="532"/> <source><b>Zoom reset</b><p>Reset the zoom of the icon. This sets the zoom factor to 100%.</p></source> <translation><b>Reset zoom</b><p>Resetta lo zoom dell'icona. Imposta il fattore di zoom al 100%.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="134"/> - <source>Paintbrush Bitmap File (*.pcx)</source> - <translation>Portable Bitmap File (*.pbm)</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="138"/> - <source>Silicon Graphics Image File (*.sgi)</source> - <translation>Silicon Graphics Image File (*.sgi)</translation> + <source>Paintbrush Bitmap File (*.pcx)</source> + <translation>Portable Bitmap File (*.pbm)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="142"/> + <source>Silicon Graphics Image File (*.sgi)</source> + <translation>Silicon Graphics Image File (*.sgi)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="146"/> <source>Targa Graphic File (*.tga)</source> <translation>Targa Graphic File (*.tga)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1145"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1150"/> <source>The file '{0}' does not exist.</source> <translation>Il file {0} non esiste.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1152"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1157"/> <source>Cannot read file '{0}: {1}.</source> <translation>Impossibile leggere il file {0}: {1}.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1186"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1191"/> <source>Cannot write file '{0}: {1}.</source> <translation>Impossibile scrivere il file {0}: {1}.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1217"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1222"/> <source>{0}[*] - {1}</source> <translation>{0}[*] - {1}</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1109"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1114"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1238"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1243"/> <source>The icon image has unsaved changes.</source> <translation>L'icona ha delle modifiche non salvate.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="131"/> + <location filename="../IconEditor/IconEditorWindow.py" line="135"/> <source>JPEG File (*.jpeg)</source> <translation>Flusso JPEG (*.jpeg)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="140"/> - <source>Compressed Scalable Vector Graphics File (*.svgz)</source> - <translation>Flusso Compressed Scalable Vector Graphics (*.svgz)</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="144"/> + <source>Compressed Scalable Vector Graphics File (*.svgz)</source> + <translation>Flusso Compressed Scalable Vector Graphics (*.svgz)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="148"/> <source>TIFF File (*.tiff)</source> <translation>Flusso TIFF (*.tiff)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="145"/> + <location filename="../IconEditor/IconEditorWindow.py" line="149"/> <source>WAP Bitmap File (*.wbmp)</source> <translation>Flusso WAP Bipmap (*.wbmp)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1238"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1243"/> <source>eric6 Icon Editor</source> <translation type="unfinished">Editor di icone di eric5 {6 ?}</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1328"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1333"/> <source>About eric6 Icon Editor</source> <translation type="unfinished">About eric5 Icon Editor {6 ?}</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1328"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1333"/> <source>The eric6 Icon Editor is a simple editor component to perform icon drawing tasks.</source> <translation type="unfinished">L'editor di icone di eric5 è un semplice componente per modificare le icone. {6 ?}</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="290"/> + <location filename="../IconEditor/IconEditorWindow.py" line="295"/> <source>Close Others</source> <translation type="unfinished">Chiudi altri</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="294"/> + <location filename="../IconEditor/IconEditorWindow.py" line="299"/> <source>Close all other icon editor windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="296"/> + <location filename="../IconEditor/IconEditorWindow.py" line="301"/> <source><b>Close Others</b><p>Closes all other icon editor windows.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="150"/> + <source>WebP Image File (*.webp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="128"/> + <source>Windows Cursor File (*.cur)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="129"/> + <source>DirectDraw-Surface File (*.dds)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="131"/> + <source>Apple Icon File (*.icns)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="133"/> + <source>JPEG2000 File (*.jp2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>IconSizeDialog</name> @@ -31995,6 +32176,189 @@ </message> </context> <context> + <name>ImageMarkupDialog</name> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="53"/> + <source>Windows Bitmap File (*.bmp)</source> + <translation type="unfinished">Windows Bitmap File (*.bmp)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="54"/> + <source>Windows Cursor File (*.cur)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="55"/> + <source>DirectDraw-Surface File (*.dds)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="56"/> + <source>Graphic Interchange Format File (*.gif)</source> + <translation type="unfinished">Graphic Interchange Format File (*.gif)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="57"/> + <source>Apple Icon File (*.icns)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="58"/> + <source>Windows Icon File (*.ico)</source> + <translation type="unfinished">Windows Icon File (*.ico)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="59"/> + <source>JPEG2000 File (*.jp2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="60"/> + <source>JPEG File (*.jpg)</source> + <translation type="unfinished">JPEG File (*.jpg)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="61"/> + <source>JPEG File (*.jpeg)</source> + <translation type="unfinished">Flusso JPEG (*.jpeg)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="62"/> + <source>Multiple-Image Network Graphics File (*.mng)</source> + <translation type="unfinished">Multiple-Image Network Graphics File (*.mng)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="63"/> + <source>Portable Bitmap File (*.pbm)</source> + <translation type="unfinished">Portable Bitmap File (*.pbm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="64"/> + <source>Paintbrush Bitmap File (*.pcx)</source> + <translation type="unfinished">Portable Bitmap File (*.pbm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="65"/> + <source>Portable Graymap File (*.pgm)</source> + <translation type="unfinished">Portable Graymap File (*.pgm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="66"/> + <source>Portable Network Graphics File (*.png)</source> + <translation type="unfinished">Portable Network Graphics File (*.png)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="67"/> + <source>Portable Pixmap File (*.ppm)</source> + <translation type="unfinished">Portable Pixmap File (*.ppm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="68"/> + <source>Silicon Graphics Image File (*.sgi)</source> + <translation type="unfinished">Silicon Graphics Image File (*.sgi)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="69"/> + <source>Scalable Vector Graphics File (*.svg)</source> + <translation type="unfinished">Scalable Vector Graphics File (*.svg)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="70"/> + <source>Compressed Scalable Vector Graphics File (*.svgz)</source> + <translation type="unfinished">Flusso Compressed Scalable Vector Graphics (*.svgz)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="72"/> + <source>Targa Graphic File (*.tga)</source> + <translation type="unfinished">Targa Graphic File (*.tga)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="73"/> + <source>TIFF File (*.tif)</source> + <translation type="unfinished">TIFF File (*.tif)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="74"/> + <source>TIFF File (*.tiff)</source> + <translation type="unfinished">Flusso TIFF (*.tiff)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="75"/> + <source>WAP Bitmap File (*.wbmp)</source> + <translation type="unfinished">Flusso WAP Bipmap (*.wbmp)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="76"/> + <source>WebP Image File (*.webp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="77"/> + <source>X11 Bitmap File (*.xbm)</source> + <translation type="unfinished">X11 Bitmap File (*.xbm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="78"/> + <source>X11 Pixmap File (*.xpm)</source> + <translation type="unfinished">X11 Pixmap File (*.xpm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="89"/> + <source>All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="14"/> + <source>Add Image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="25"/> + <source>Image Address:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="41"/> + <source>Enter the image path or URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="48"/> + <source>Title:</source> + <translation type="unfinished">Titolo:</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="58"/> + <source>Alternative Text:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="73"/> + <source>Keep Original Size</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="80"/> + <source>Keep Aspect Ratio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="89"/> + <source>Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="119"/> + <source> px</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="109"/> + <source>Height:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ImagesIcon</name> <message> <location filename="../WebBrowser/StatusBar/ImagesIcon.py" line="40"/> @@ -34899,7 +35263,7 @@ <translation>Seleziona il lexer alternativo da associare</translation> </message> <message> - <location filename="../Project/LexerAssociationDialog.py" line="131"/> + <location filename="../Project/LexerAssociationDialog.py" line="134"/> <source>Alternative</source> <translation>Alternativo</translation> </message> @@ -35235,317 +35599,317 @@ <translation>Makefile</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="117"/> + <location filename="../QScintilla/Lexers/__init__.py" line="121"/> <source>Perl</source> <translation>Perl</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="121"/> + <location filename="../QScintilla/Lexers/__init__.py" line="125"/> <source>Povray</source> <translation>Povray</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="123"/> + <location filename="../QScintilla/Lexers/__init__.py" line="127"/> <source>Properties</source> <translation>Proprietà</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="131"/> + <location filename="../QScintilla/Lexers/__init__.py" line="135"/> <source>Ruby</source> <translation>Ruby</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="133"/> - <source>SQL</source> - <translation>SQL</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="137"/> + <source>SQL</source> + <translation>SQL</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="141"/> <source>TeX</source> <translation>TeX</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="139"/> + <location filename="../QScintilla/Lexers/__init__.py" line="143"/> <source>VHDL</source> <translation>VHDL</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="547"/> + <location filename="../QScintilla/Lexers/__init__.py" line="565"/> <source>Pyrex Files (*.pyx)</source> <translation>File Pyrex (*.pyx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="550"/> - <source>Quixote Template Files (*.ptl)</source> - <translation>File template Quixote</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="553"/> - <source>Ruby Files (*.rb)</source> - <translation>File Ruby (*.rb)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="556"/> - <source>IDL Files (*.idl)</source> - <translation>File IDL (*.idl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="383"/> - <source>C Files (*.h *.c)</source> - <translation>File C (*.h *.c)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="386"/> - <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> - <translation>File C++ (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="568"/> + <source>Quixote Template Files (*.ptl)</source> + <translation>File template Quixote</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="571"/> + <source>Ruby Files (*.rb)</source> + <translation>File Ruby (*.rb)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="574"/> + <source>IDL Files (*.idl)</source> + <translation>File IDL (*.idl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="393"/> + <source>C Files (*.h *.c)</source> + <translation>File C (*.h *.c)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="396"/> + <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> + <translation>File C++ (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="586"/> <source>C# Files (*.cs)</source> <translation>File C# (*.cs)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="392"/> + <location filename="../QScintilla/Lexers/__init__.py" line="402"/> <source>HTML Files (*.html *.htm *.asp *.shtml)</source> <translation>File HTML (*.html *.htm *.asp *.shtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="580"/> + <location filename="../QScintilla/Lexers/__init__.py" line="598"/> <source>CSS Files (*.css)</source> <translation>File CSS (*.css)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="583"/> + <location filename="../QScintilla/Lexers/__init__.py" line="601"/> <source>QSS Files (*.qss)</source> <translation>File QSS (*.qss)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="401"/> + <location filename="../QScintilla/Lexers/__init__.py" line="411"/> <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> <translation>File PHP (*.php *.php3 *.php4 *.php5 *.phtml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="595"/> - <source>Qt Resource Files (*.qrc)</source> - <translation>File Risorse Qt (*.qrc)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="410"/> - <source>D Files (*.d *.di)</source> - <translation>File D (*.d *.di)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="604"/> - <source>Java Files (*.java)</source> - <translation>File Java (*.java)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="607"/> - <source>JavaScript Files (*.js)</source> - <translation>File JavaScript (*.js)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="610"/> - <source>SQL Files (*.sql)</source> - <translation>File SQL (*.sql)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="613"/> - <source>Docbook Files (*.docbook)</source> - <translation>File Docbook (*.docbook)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="425"/> - <source>Perl Files (*.pl *.pm *.ph)</source> - <translation>File Perl (*.pl *.pm *.ph)</translation> + <source>Qt Resource Files (*.qrc)</source> + <translation>File Risorse Qt (*.qrc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="420"/> + <source>D Files (*.d *.di)</source> + <translation>File D (*.d *.di)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="622"/> - <source>Lua Files (*.lua)</source> - <translation>File Lua (*.lua)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="431"/> - <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> - <translation>File TeX (*.tex *.sty *.aux *.toc *.idx)</translation> + <source>Java Files (*.java)</source> + <translation>File Java (*.java)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="625"/> + <source>JavaScript Files (*.js)</source> + <translation>File JavaScript (*.js)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="628"/> + <source>SQL Files (*.sql)</source> + <translation>File SQL (*.sql)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="631"/> + <source>Docbook Files (*.docbook)</source> + <translation>File Docbook (*.docbook)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="435"/> + <source>Perl Files (*.pl *.pm *.ph)</source> + <translation>File Perl (*.pl *.pm *.ph)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="640"/> + <source>Lua Files (*.lua)</source> + <translation>File Lua (*.lua)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="441"/> + <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> + <translation>File TeX (*.tex *.sty *.aux *.toc *.idx)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="643"/> <source>Shell Files (*.sh)</source> <translation>File Shell (*.sh)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="437"/> + <location filename="../QScintilla/Lexers/__init__.py" line="447"/> <source>Batch Files (*.bat *.cmd)</source> <translation>File Batch (*.bat *.cmd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="440"/> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> <source>Diff Files (*.diff *.patch)</source> <translation>File Diff (*.diff *.patch)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="443"/> - <source>Makefiles (*.mak)</source> - <translation>Makefile (*,mak)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="446"/> - <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> - <translation>File proprietà (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="649"/> - <source>Povray Files (*.pov)</source> - <translation>File Povray (*.pov)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="453"/> - <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> - <translation>File CMake (CMakeLists.txt *.cmake *.ctest)</translation> + <source>Makefiles (*.mak)</source> + <translation>Makefile (*,mak)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="456"/> + <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> + <translation>File proprietà (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="667"/> + <source>Povray Files (*.pov)</source> + <translation>File Povray (*.pov)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="463"/> + <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> + <translation>File CMake (CMakeLists.txt *.cmake *.ctest)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="466"/> <source>VHDL Files (*.vhd *.vhdl)</source> <translation>File VHDL (*.vhd *.vhdl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="718"/> + <location filename="../QScintilla/Lexers/__init__.py" line="744"/> <source>All Files (*)</source> <translation>Tutti i file (*)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="135"/> + <location filename="../QScintilla/Lexers/__init__.py" line="139"/> <source>TCL</source> <translation>TCL</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="459"/> + <location filename="../QScintilla/Lexers/__init__.py" line="469"/> <source>TCL/Tk Files (*.tcl *.tk)</source> <translation>File TCL/Tk (*.tcl *.tk)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="559"/> - <source>C Files (*.c)</source> - <translation>File C (*.c)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="562"/> - <source>C++ Files (*.cpp)</source> - <translation>File C++ (*.cpp)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="565"/> - <source>C++/C Header Files (*.h)</source> - <translation>File Header C/C++ (*.h)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="571"/> - <source>HTML Files (*.html)</source> - <translation>File HTML (*.html)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="574"/> - <source>PHP Files (*.php)</source> - <translation>File PHP (*.php)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="577"/> - <source>ASP Files (*.asp)</source> - <translation>File ASP (*.asp)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="586"/> - <source>XML Files (*.xml)</source> - <translation>File XML (*.xml)</translation> + <source>C Files (*.c)</source> + <translation>File C (*.c)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="580"/> + <source>C++ Files (*.cpp)</source> + <translation>File C++ (*.cpp)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="583"/> + <source>C++/C Header Files (*.h)</source> + <translation>File Header C/C++ (*.h)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="589"/> - <source>XSL Files (*.xsl)</source> - <translation>File XSL (*.xsl)</translation> + <source>HTML Files (*.html)</source> + <translation>File HTML (*.html)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="592"/> + <source>PHP Files (*.php)</source> + <translation>File PHP (*.php)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="595"/> + <source>ASP Files (*.asp)</source> + <translation>File ASP (*.asp)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="604"/> + <source>XML Files (*.xml)</source> + <translation>File XML (*.xml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="607"/> + <source>XSL Files (*.xsl)</source> + <translation>File XSL (*.xsl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="610"/> <source>DTD Files (*.dtd)</source> <translation>File DTD (*.dtd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="598"/> - <source>D Files (*.d)</source> - <translation>File D (*.d)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="601"/> - <source>D Interface Files (*.di)</source> - <translation>File interfaccia D (*.di)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="616"/> - <source>Perl Files (*.pl)</source> - <translation>File Perl (*.pl)</translation> + <source>D Files (*.d)</source> + <translation>File D (*.d)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="619"/> - <source>Perl Module Files (*.pm)</source> - <translation>File moduli Perl (*.pm)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="628"/> - <source>Batch Files (*.bat)</source> - <translation>File Batch (*.bat)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="631"/> - <source>TeX Files (*.tex)</source> - <translation>File TeX (*.tex)</translation> + <source>D Interface Files (*.di)</source> + <translation>File interfaccia D (*.di)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="634"/> - <source>TeX Template Files (*.sty)</source> - <translation>File Template TeX (*.sty)</translation> + <source>Perl Files (*.pl)</source> + <translation>File Perl (*.pl)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="637"/> - <source>Diff Files (*.diff)</source> - <translation>File Diff (*.diff)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="640"/> - <source>Make Files (*.mak)</source> - <translation>File Make (*.mak)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="643"/> - <source>Properties Files (*.ini)</source> - <translation>File proprietà (*.ini)</translation> + <source>Perl Module Files (*.pm)</source> + <translation>File moduli Perl (*.pm)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="646"/> - <source>Configuration Files (*.cfg)</source> - <translation>File configurazione (*.cfg)</translation> + <source>Batch Files (*.bat)</source> + <translation>File Batch (*.bat)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="649"/> + <source>TeX Files (*.tex)</source> + <translation>File TeX (*.tex)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="652"/> - <source>CMake Files (CMakeLists.txt)</source> - <translation>File CMake (CMakeList.txt)</translation> + <source>TeX Template Files (*.sty)</source> + <translation>File Template TeX (*.sty)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="655"/> - <source>CMake Macro Files (*.cmake)</source> - <translation>File Macro CMake (*.cmake)</translation> + <source>Diff Files (*.diff)</source> + <translation>File Diff (*.diff)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="658"/> - <source>VHDL Files (*.vhd)</source> - <translation>File VHDL (*.vhd)</translation> + <source>Make Files (*.mak)</source> + <translation>File Make (*.mak)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="661"/> - <source>TCL Files (*.tcl)</source> - <translation>File TCL (*.tcl)</translation> + <source>Properties Files (*.ini)</source> + <translation>File proprietà (*.ini)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="664"/> + <source>Configuration Files (*.cfg)</source> + <translation>File configurazione (*.cfg)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="670"/> + <source>CMake Files (CMakeLists.txt)</source> + <translation>File CMake (CMakeList.txt)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="673"/> + <source>CMake Macro Files (*.cmake)</source> + <translation>File Macro CMake (*.cmake)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="676"/> + <source>VHDL Files (*.vhd)</source> + <translation>File VHDL (*.vhd)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="679"/> + <source>TCL Files (*.tcl)</source> + <translation>File TCL (*.tcl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="682"/> <source>Tk Files (*.tk)</source> <translation>File Tk (*.tk)</translation> </message> @@ -35560,175 +35924,195 @@ <translation>Fortran77</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="115"/> + <location filename="../QScintilla/Lexers/__init__.py" line="119"/> <source>Pascal</source> <translation>Pascal</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="119"/> + <location filename="../QScintilla/Lexers/__init__.py" line="123"/> <source>PostScript</source> <translation>PostScript</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="141"/> + <location filename="../QScintilla/Lexers/__init__.py" line="145"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="143"/> + <location filename="../QScintilla/Lexers/__init__.py" line="147"/> <source>YAML</source> <translation>YAML</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="404"/> + <location filename="../QScintilla/Lexers/__init__.py" line="414"/> <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> <translation>File XML (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="462"/> + <location filename="../QScintilla/Lexers/__init__.py" line="472"/> <source>Fortran Files (*.f90 *.f95 *.f2k)</source> <translation>File Fortran (*.f90 *.f95 *.f2k)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="465"/> + <location filename="../QScintilla/Lexers/__init__.py" line="475"/> <source>Fortran77 Files (*.f *.for)</source> <translation>File Fortran77 (*.f *.for)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="468"/> + <location filename="../QScintilla/Lexers/__init__.py" line="478"/> <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> <translation>File Pascal (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="676"/> + <location filename="../QScintilla/Lexers/__init__.py" line="694"/> <source>PostScript Files (*.ps)</source> <translation>File PostScript (*.ps)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="474"/> + <location filename="../QScintilla/Lexers/__init__.py" line="484"/> <source>YAML Files (*.yaml *.yml)</source> <translation>File YAML (*.yaml *.yml)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="667"/> - <source>Fortran Files (*.f95)</source> - <translation>File Fortran (*.f95)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="670"/> - <source>Fortran77 Files (*.f)</source> - <translation>File Fortran77 (*.f)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="673"/> - <source>Pascal Files (*.pas)</source> - <translation>File Pascal (*.pas)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="679"/> - <source>YAML Files (*.yml)</source> - <translation>File YAML (*.yaml *.yml)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="171"/> - <source>Pygments</source> - <translation>Pygments</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="365"/> - <source>Python Files (*.py *.py2 *.py3)</source> - <translation>Python Files (*.py *.py2 *.py3)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="368"/> - <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> - <translation>Python GUI Files (*.pyw *.pyw2 *.pyw3)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="538"/> - <source>Python3 Files (*.py)</source> - <translation>Python3 Files (*.py)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="544"/> - <source>Python3 GUI Files (*.pyw)</source> - <translation>Python3 GUI Files (*.pyw)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="535"/> - <source>Python2 Files (*.py2)</source> - <translation>Python Files (*.py2)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="541"/> - <source>Python2 GUI Files (*.pyw2)</source> - <translation>Python GUI Files (*.pyw2)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="125"/> - <source>Python2</source> - <translation>Python2</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="127"/> - <source>Python3</source> - <translation>Python3</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="148"/> - <source>Matlab</source> - <translation>Matlab</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="148"/> - <source>Octave</source> - <translation>Octave</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="480"/> - <source>Matlab Files (*.m *.m.matlab)</source> - <translation>File Matlab (*.m *.m.matlab)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="480"/> - <source>Octave Files (*.m *.m.octave)</source> - <translation>File Octave (*.m *.m.octave)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="685"/> - <source>Matlab Files (*.m)</source> - <translation>File Matlab (*.m)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="685"/> - <source>Octave Files (*.m.octave)</source> - <translation>File Octave (*.m.octave)</translation> + <source>Fortran Files (*.f95)</source> + <translation>File Fortran (*.f95)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="688"/> + <source>Fortran77 Files (*.f)</source> + <translation>File Fortran77 (*.f)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="691"/> + <source>Pascal Files (*.pas)</source> + <translation>File Pascal (*.pas)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="697"/> + <source>YAML Files (*.yml)</source> + <translation>File YAML (*.yaml *.yml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="175"/> + <source>Pygments</source> + <translation>Pygments</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="375"/> + <source>Python Files (*.py *.py2 *.py3)</source> + <translation>Python Files (*.py *.py2 *.py3)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="378"/> + <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> + <translation>Python GUI Files (*.pyw *.pyw2 *.pyw3)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="556"/> + <source>Python3 Files (*.py)</source> + <translation>Python3 Files (*.py)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="562"/> + <source>Python3 GUI Files (*.pyw)</source> + <translation>Python3 GUI Files (*.pyw)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="553"/> + <source>Python2 Files (*.py2)</source> + <translation>Python Files (*.py2)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="559"/> + <source>Python2 GUI Files (*.pyw2)</source> + <translation>Python GUI Files (*.pyw2)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="129"/> + <source>Python2</source> + <translation>Python2</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="131"/> + <source>Python3</source> + <translation>Python3</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="115"/> + <source>Matlab</source> + <translation>Matlab</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="117"/> + <source>Octave</source> + <translation>Octave</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="487"/> + <source>Matlab Files (*.m *.m.matlab)</source> + <translation>File Matlab (*.m *.m.matlab)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="490"/> + <source>Octave Files (*.m *.m.octave)</source> + <translation>File Octave (*.m *.m.octave)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="700"/> + <source>Matlab Files (*.m)</source> + <translation>File Matlab (*.m)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="703"/> + <source>Octave Files (*.m.octave)</source> + <translation>File Octave (*.m.octave)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="133"/> <source>QSS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="157"/> + <location filename="../QScintilla/Lexers/__init__.py" line="153"/> <source>Gettext</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="695"/> + <location filename="../QScintilla/Lexers/__init__.py" line="709"/> <source>Gettext Files (*.po)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="162"/> + <location filename="../QScintilla/Lexers/__init__.py" line="158"/> <source>CoffeeScript</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="702"/> + <location filename="../QScintilla/Lexers/__init__.py" line="716"/> <source>CoffeeScript Files (*.coffee)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="163"/> + <source>JSON</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="723"/> + <source>JSON Files (*.json)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="166"/> + <source>Markdown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="728"/> + <source>Markdown Files (*.md)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>LfConvertDataDialog</name> @@ -35941,6 +36325,19 @@ </message> </context> <context> + <name>MarkdownProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/MarkdownProvider.py" line="383"/> + <source>Create List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/MarkdownProvider.py" line="383"/> + <source>Enter desired number of list elements:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>MasterPasswordEntryDialog</name> <message> <location filename="../Preferences/ConfigurationPages/MasterPasswordEntryDialog.ui" line="14"/> @@ -36016,12 +36413,12 @@ <context> <name>McCabeChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="423"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="426"/> <source>'{0}' is too complex ({1})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="425"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="428"/> <source>{0}: {1}</source> <translation type="unfinished">{0}: {1}</translation> </message> @@ -36049,103 +36446,98 @@ <translation>Inserisci il numero di messaggi di log da mostrare</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="155"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="161"/> <source>No. of commit messages to remember:</source> <translation>N. di messaggi di commit da ricordare:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="168"/> <source>Enter the number of commit messages to remember</source> <translation>Inserisci il numero di messaggi di commit da ricordare</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="236"/> <source>Incoming / Outgoing</source> - <translation>In ingerro / In uscita</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="222"/> - <source>Select to show the incoming and outgoing log in a log browser dialog</source> - <translation>Seleziona per mostrare i log in ingresso ed uscita in un dialogo browser</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="225"/> + <translation type="obsolete">In ingerro / In uscita</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="242"/> + <source>Select to update the working directory to new tip</source> + <translation>Seleziona per aggiornare la directory di lavoro al nuovo tip</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="245"/> <source>Use Log Browser for incoming / outgoing log</source> - <translation>Usa il Log Browser per i log in ingresso/uscita</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="235"/> + <translation type="obsolete">Usa il Log Browser per i log in ingresso/uscita</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="236"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="241"/> - <source>Select to update the working directory to new tip</source> - <translation>Seleziona per aggiornare la directory di lavoro al nuovo tip</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="245"/> <source>Update after pulling</source> <translation>Aggiorna dopo il pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="334"/> <source>Edit the Mercurial configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="337"/> <source>Edit configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="311"/> <source>Cleanup</source> <translation type="unfinished">Pulisci</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="317"/> <source>Pattern:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="324"/> <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="252"/> <source>Select to prefer unbundle over pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="255"/> <source><b>Prefer Unbundle</b> <p>If this option is selected, it will be checked, if a Mercurial changegroups file from a previous "Show Incoming" request exists. In this case it will be applied and deleted. Otherwise a pull request will be sent.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="259"/> <source>Prefer Unbundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="292"/> <source>Revert</source> <translation type="unfinished">Inverti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="298"/> <source>Select to create a backup file (.orig) before reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="301"/> <source>Create Backup Files</source> <translation type="unfinished"></translation> </message> @@ -36180,36 +36572,46 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="269"/> <source>Merge</source> <translation type="unfinished">Fondi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="275"/> <source>Select to enforce usage of the Mercural internal merge tool</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="278"/> <source><b>Internal Merge Tool</b> <p>Select to enforce usage of the Mercural internal merge tool,which leaves conflict markers in the file in case of conflicting changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="282"/> <source>Use internal merge with conflict markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="197"/> <source>No. of commit authors to remember:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="204"/> <source>Enter the number of commit authors to remember</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="132"/> + <source>No. of message characters shown in list:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="139"/> + <source>Enter the number of characters of the commit message to be shown in the list</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -37168,107 +37570,107 @@ <context> <name>MiscellaneousChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="429"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="432"/> <source>coding magic comment not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="432"/> - <source>unknown encoding ({0}) found in coding magic comment</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="435"/> - <source>copyright notice not present</source> + <source>unknown encoding ({0}) found in coding magic comment</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="438"/> - <source>copyright notice contains invalid author</source> + <source>copyright notice not present</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="441"/> - <source>blind except: statement</source> + <source>copyright notice contains invalid author</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="444"/> - <source>found {0} formatter</source> + <source>blind except: statement</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="447"/> - <source>format string does contain unindexed parameters</source> + <source>found {0} formatter</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="450"/> - <source>docstring does contain unindexed parameters</source> + <source>format string does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="453"/> - <source>other string does contain unindexed parameters</source> + <source>docstring does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="456"/> - <source>format call uses too large index ({0})</source> + <source>other string does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="459"/> - <source>format call uses missing keyword ({0})</source> + <source>format call uses too large index ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="462"/> - <source>format call uses keyword arguments but no named entries</source> + <source>format call uses missing keyword ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="465"/> - <source>format call uses variable arguments but no numbered entries</source> + <source>format call uses keyword arguments but no named entries</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="468"/> - <source>format call uses implicit and explicit indexes together</source> + <source>format call uses variable arguments but no numbered entries</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="471"/> - <source>format call provides unused index ({0})</source> + <source>format call uses implicit and explicit indexes together</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="474"/> - <source>format call provides unused keyword ({0})</source> + <source>format call provides unused index ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="477"/> - <source>expected these __future__ imports: {0}; but only got: {1}</source> + <source>format call provides unused keyword ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="480"/> - <source>expected these __future__ imports: {0}; but got none</source> + <source>expected these __future__ imports: {0}; but only got: {1}</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="483"/> - <source>print statement found</source> + <source>expected these __future__ imports: {0}; but got none</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="486"/> - <source>one element tuple found</source> + <source>print statement found</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="489"/> + <source>one element tuple found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="492"/> <source>{0}: {1}</source> <translation type="unfinished">{0}: {1}</translation> </message> @@ -37678,72 +38080,72 @@ <context> <name>NamingStyleChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="378"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> <source>class names should use CapWords convention</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> - <source>function name should be lowercase</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="384"/> - <source>argument name should be lowercase</source> + <source>function name should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="387"/> - <source>first argument of a class method should be named 'cls'</source> + <source>argument name should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="390"/> - <source>first argument of a method should be named 'self'</source> + <source>first argument of a class method should be named 'cls'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="393"/> + <source>first argument of a method should be named 'self'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="396"/> <source>first argument of a static method should not be named 'self' or 'cls</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="397"/> - <source>module names should be lowercase</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="400"/> - <source>package names should be lowercase</source> + <source>module names should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="403"/> - <source>constant imported as non constant</source> + <source>package names should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="406"/> - <source>lowercase imported as non lowercase</source> + <source>constant imported as non constant</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="409"/> - <source>camelcase imported as lowercase</source> + <source>lowercase imported as non lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="412"/> - <source>camelcase imported as constant</source> + <source>camelcase imported as lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="415"/> - <source>variable in function should be lowercase</source> + <source>camelcase imported as constant</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="418"/> + <source>variable in function should be lowercase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="421"/> <source>names 'l', 'O' and 'I' should be avoided</source> <translation type="unfinished"></translation> </message> @@ -40152,27 +40554,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1525"/> + <location filename="../Preferences/__init__.py" line="1530"/> <source>Export Preferences</source> <translation>Esporta Preferenze</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1553"/> + <location filename="../Preferences/__init__.py" line="1558"/> <source>Import Preferences</source> <translation>Importa Preferenze</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1553"/> + <location filename="../Preferences/__init__.py" line="1558"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>File proprietà (*.ini);;Tutti i file(*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1655"/> + <location filename="../Preferences/__init__.py" line="1660"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1655"/> + <location filename="../Preferences/__init__.py" line="1660"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -40200,7 +40602,7 @@ <message> <location filename="../UI/Previewers/PreviewerHTML.py" line="597"/> <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> - <translation type="unfinished"><p>La visualizzazione Markdown richiede <b>il pacchetto</b> python-markdown.<br/>Intallarlo con il vostro gestore di pacchetti o vedere <a href="http://pythonhosted.org/Markdown/install.html"> per le istruzioni di installazione.</a></p></translation> + <translation type="obsolete"><p>La visualizzazione Markdown richiede <b>il pacchetto</b> python-markdown.<br/>Intallarlo con il vostro gestore di pacchetti o vedere <a href="http://pythonhosted.org/Markdown/install.html"> per le istruzioni di installazione.</a></p></translation> </message> <message> <location filename="../UI/Previewers/PreviewerHTML.py" line="374"/> @@ -40208,7 +40610,7 @@ <translation type="obsolete"><p>La visualizzazione ReStructuredText richiede <b>il pacchetto</b> python-docutils.<br/>Installarlo con il vostro gestore di pacchetti o vedere <a href="http://pypi.python.org/pypi/docutils"> questa pagina.</a></p></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="572"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="565"/> <source><p>ReStructuredText preview requires the <b>python-docutils</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pypi.python.org/pypi/docutils">this page.</a></p></source> <translation type="unfinished"></translation> </message> @@ -40217,6 +40619,11 @@ <source><p>ReStructuredText preview requires the <b>sphinx</b> package.<br/>Install it with your package manager,'pip install Sphinx' or see <a href="http://pypi.python.org/pypi/Sphinx">this page.</a></p><p>Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="590"/> + <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PreviewerHTML</name> @@ -40241,17 +40648,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="177"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="179"/> <source><p>No preview available for this type of file.</p></source> <translation type="unfinished"><p>Non è prevista la visualizzazione per questo tipo di flusso.</p></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="225"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="230"/> <source>Preview - {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="227"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="232"/> <source>Preview</source> <translation type="unfinished"></translation> </message> @@ -44864,521 +45271,506 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/> - <source>Show log</source> - <translation type="unfinished">Mostra log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/> - <source>Show &log</source> - <translation type="unfinished">Mostra &log</translation> + <source>Show log browser</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> - <source>Show the log of the local project</source> - <translation type="unfinished">Mostra i log del progetto locale</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation type="unfinished">Mostra un dialogo per navigare i log del progetto locale</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="107"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation type="unfinished"><b>Mostra log</b><p>Mostra i log del progetto locale.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="114"/> - <source>Show log browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="119"/> - <source>Show a dialog to browse the log of the local project</source> - <translation type="unfinished">Mostra un dialogo per navigare i log del progetto locale</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/> + <translation type="obsolete"><b>Mostra log</b><p>Mostra i log del progetto locale.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="107"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"><b>Mostra borwser log</b><p>Mostra un dialogo per navigare i log del progetto locale. Inizialmente viene mostrato un numero limitato di elementi. Altri possono essere scaricati in seguito.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/> <source>Show &difference</source> <translation type="unfinished">Mostra &differenza</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished">Mostra le differenze tra il progetto locale e il repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="132"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="137"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished">Mostra le differenze tra la revisione del progetto e il repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="140"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/> <source>Show differences (URLs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="153"/> <source>Show the difference of the project between two repository URLs</source> <translation type="unfinished">Mostra le differenze del progetto tra due URL del repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="156"/> <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/> + <source>Show status</source> + <translation type="unfinished">Mostra stato</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/> + <source>Show &status</source> + <translation type="unfinished">Mostra &stato</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> + <source>Show the status of the local project</source> + <translation type="unfinished">Mostra lo stato del progetto locale</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="172"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished"><b>Mostra stato</b><p>Mostra lo stato del progetto locale.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> - <source>Show status</source> - <translation type="unfinished">Mostra stato</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> - <source>Show &status</source> - <translation type="unfinished">Mostra &stato</translation> + <source>Show change lists</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/> - <source>Show the status of the local project</source> - <translation type="unfinished">Mostra lo stato del progetto locale</translation> + <source>Show the change lists and associated files of the local project</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="187"/> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation type="unfinished"><b>Mostra stato</b><p>Mostra lo stato del progetto locale.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> - <source>Show change lists</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="199"/> - <source>Show the change lists and associated files of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="202"/> <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> <source>Show repository info</source> <translation type="unfinished">Mostra informazioni del repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="215"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="200"/> <source>Show some repository related information for the local project</source> <translation type="unfinished">Mostra alcune informazioni relative al repository del progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="203"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation type="unfinished"><b>Mostra informazioni Repository</b><p>Mostra alcune informazioni relative al repository del progetto locale.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source>Tag in repository</source> + <translation type="unfinished">Tag nel repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source>&Tag in repository...</source> + <translation type="unfinished">&Tag nel repository...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="216"/> + <source>Tag the local project in the repository</source> + <translation type="unfinished">Tag del progetto locale nel repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"><b>Tag nel repository</b><p>Tag del progetto locale nel repository.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> - <source>Tag in repository</source> - <translation type="unfinished">Tag nel repository</translation> + <source>Export from repository</source> + <translation type="unfinished">Esporta dal repository</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> - <source>&Tag in repository...</source> - <translation type="unfinished">&Tag nel repository...</translation> + <source>&Export from repository...</source> + <translation type="unfinished">&Esporta dal repository...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="231"/> - <source>Tag the local project in the repository</source> - <translation type="unfinished">Tag del progetto locale nel repository</translation> + <source>Export a project from the repository</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished"><b>Tag nel repository</b><p>Tag del progetto locale nel repository.</p></translation> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation type="unfinished"><b>Esporta dal repository</b><p>Esporta un progetto dal repository.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> - <source>Export from repository</source> - <translation type="unfinished">Esporta dal repository</translation> + <source>Command options</source> + <translation type="unfinished">Opzione comando</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> - <source>&Export from repository...</source> - <translation type="unfinished">&Esporta dal repository...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="246"/> - <source>Export a project from the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation type="unfinished"><b>Esporta dal repository</b><p>Esporta un progetto dal repository.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/> - <source>Command options</source> - <translation type="unfinished">Opzione comando</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/> <source>Command &options...</source> <translation type="unfinished">&Opzioni comando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Show the VCS command options</source> <translation type="unfinished">Mostra le opzioni del comando VCS</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation type="unfinished"><b>Opzioni comando...</b><p>Mostra un dialogo per modificare le opzioni del comando VCS.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/> + <source>Re&vert changes</source> + <translation type="unfinished">In&verti modifiche</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <source>Revert all changes made to the local project</source> + <translation type="unfinished">Inverti tutte le modifiche fatte al progetto locale</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation type="unfinished"><b>Opzioni comando...</b><p>Mostra un dialogo per modificare le opzioni del comando VCS.</p></translation> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation type="unfinished"><b>Inverti modifiche</b><p>Inverte tutte le modifiche fatte al progetto locale.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/> - <source>Revert changes</source> - <translation type="unfinished"></translation> + <source>Merge</source> + <translation type="unfinished">Fondi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/> - <source>Re&vert changes</source> - <translation type="unfinished">In&verti modifiche</translation> + <source>Mer&ge changes...</source> + <translation type="unfinished">Fon&di modifiche...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> - <source>Revert all changes made to the local project</source> - <translation type="unfinished">Inverti tutte le modifiche fatte al progetto locale</translation> + <source>Merge changes of a tag/revision into the local project</source> + <translation type="unfinished">Fondi le modifiche del tag/revision nel progetto locale</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation type="unfinished"><b>Inverti modifiche</b><p>Inverte tutte le modifiche fatte al progetto locale.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/> - <source>Merge</source> - <translation type="unfinished">Fondi</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/> - <source>Mer&ge changes...</source> - <translation type="unfinished">Fon&di modifiche...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="289"/> - <source>Merge changes of a tag/revision into the local project</source> - <translation type="unfinished">Fondi le modifiche del tag/revision nel progetto locale</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation type="unfinished"><b>Fondi</b><p>Fonde le modifiche del tag/revisione nel progetto locale.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/> + <source>S&witch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <source>Switch the local copy to another tag/branch</source> + <translation type="unfinished">Cambia la copia locale ad un altro tag/branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> + <translation type="unfinished"><b>Cambia</b><p>Cambia la copia locale ad un altro tag/branch.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>Switch</source> + <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>S&witch...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> - <source>Switch the local copy to another tag/branch</source> - <translation type="unfinished">Cambia la copia locale ad un altro tag/branch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> - <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> - <translation type="unfinished"><b>Cambia</b><p>Cambia la copia locale ad un altro tag/branch.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> - <source>Conflicts resolved</source> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="304"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="307"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> + <source>Cleanup</source> + <translation type="unfinished">Pulisci</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> + <source>Cleanu&p</source> + <translation type="unfinished">&Pulisci</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished"></translation> + <source>Cleanup the local project</source> + <translation type="unfinished">Pulisci il progetto locale</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="322"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/> - <source>Cleanup</source> - <translation type="unfinished">Pulisci</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/> - <source>Cleanu&p</source> - <translation type="unfinished">&Pulisci</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> - <source>Cleanup the local project</source> - <translation type="unfinished">Pulisci il progetto locale</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="337"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation type="unfinished"><b>Pulizia</b><p>Esegue la pulizia del progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>Execute command</source> <translation type="unfinished">Esegui comando</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>E&xecute command...</source> <translation type="unfinished">&Esegui comando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="333"/> <source>Execute an arbitrary VCS command</source> <translation type="unfinished">Esegui un comando VCS arbitrario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="336"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation type="unfinished"><b>Esegui comando</b><p>Apre un dialogo per inserire un comando VCS arbitraio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/> <source>List tags</source> <translation type="unfinished">Elenca tag</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/> <source>List tags...</source> <translation type="unfinished">Elenca tag...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> <source>List tags of the project</source> <translation type="unfinished">Elenca i tag del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="350"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"><b>Elenca tag</b><p>Elenca i tag del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches</source> <translation type="unfinished">Elenca branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches...</source> <translation type="unfinished">Elenca branches...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="361"/> <source>List branches of the project</source> <translation type="unfinished">Elenca i branches del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="364"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation type="unfinished"><b>Elenca branches</b><p>Elenca i branch del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source>List repository contents</source> <translation type="unfinished">Elenca contenuti repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source>List repository contents...</source> <translation type="unfinished">Elenca contenuti repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="375"/> <source>Lists the contents of the repository</source> <translation type="unfinished">Elenca i contenuti del repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation type="unfinished"><b>Elanca contenuti del repository</b><p>Elenca i contenuti del repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/> <source>Set Property</source> <translation type="unfinished">Imposta proprietà</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/> <source>Set Property...</source> <translation type="unfinished">Imposta proprietà...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="389"/> <source>Set a property for the project files</source> <translation type="unfinished">Imposta una proprietà per i file del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="392"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation type="unfinished"><b>Imposta proprietà</b><p>Imposta una proprietà per i file del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source>List Properties</source> <translation type="unfinished">Elenca proprietà</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source>List Properties...</source> <translation type="unfinished">Elenca proprietà...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="403"/> <source>List properties of the project files</source> <translation type="unfinished">Elenca le proprietà dei file del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation type="unfinished"><b>Elenca proprietà</b><p>Elenca le proprietàd ei file del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/> <source>Delete Property</source> <translation type="unfinished">Cancella proprietà</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/> <source>Delete Property...</source> <translation type="unfinished">Cancella proprietà...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> + <source>Delete a property for the project files</source> + <translation type="unfinished">Cancella una proprietà per i file del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="420"/> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation type="unfinished"><b>Cancella proprietà</b><p>Cancella una proprietà per i file del progetto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/> + <source>Relocate</source> + <translation type="unfinished">Rialloca</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/> + <source>Relocate...</source> + <translation type="unfinished">Rialloca...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> - <source>Delete a property for the project files</source> - <translation type="unfinished">Cancella una proprietà per i file del progetto</translation> + <source>Relocate the working copy to a new repository URL</source> + <translation type="unfinished">Rialloca la copia di lavoro ad una nuovo URL del repository</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation type="unfinished"><b>Cancella proprietà</b><p>Cancella una proprietà per i file del progetto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/> - <source>Relocate</source> - <translation type="unfinished">Rialloca</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/> - <source>Relocate...</source> - <translation type="unfinished">Rialloca...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> - <source>Relocate the working copy to a new repository URL</source> - <translation type="unfinished">Rialloca la copia di lavoro ad una nuovo URL del repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation type="unfinished"><b>Rialloca</b><p>Rialloca la copia di lavoro ad una nuovo URL del repository.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/> + <source>Repository Browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/> + <source>Repository Browser...</source> + <translation type="unfinished">Browser Repository...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> + <source>Show the Repository Browser dialog</source> + <translation type="unfinished">Mostra il dialogo del Browser di repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation type="unfinished"><b>Browser Repository</b><p>Mostra il dialogo del Browser del repository.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> - <source>Repository Browser</source> - <translation type="unfinished"></translation> + <source>Configure</source> + <translation type="unfinished">Configura</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> - <source>Repository Browser...</source> - <translation type="unfinished">Browser Repository...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="463"/> - <source>Show the Repository Browser dialog</source> - <translation type="unfinished">Mostra il dialogo del Browser di repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="466"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation type="unfinished"><b>Browser Repository</b><p>Mostra il dialogo del Browser del repository.</p></translation> + <source>Configure...</source> + <translation type="unfinished">Configura...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="462"/> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation type="unfinished">Mostra il dialogo di configurazione con la pagina di Subversion selezionata</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="465"/> + <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> + <translation type="unfinished"><b>Configura</b><p>Mostra il dialogo di configurazione con la pagina di Subversion selezionata.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/> - <source>Configure</source> - <translation type="unfinished">Configura</translation> + <source>Upgrade</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/> - <source>Configure...</source> - <translation type="unfinished">Configura...</translation> + <source>Upgrade...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="477"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation type="unfinished">Mostra il dialogo di configurazione con la pagina di Subversion selezionata</translation> + <source>Upgrade the working copy to the current format</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="480"/> - <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> - <translation type="unfinished"><b>Configura</b><p>Mostra il dialogo di configurazione con la pagina di Subversion selezionata.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/> - <source>Upgrade</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/> - <source>Upgrade...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="492"/> - <source>Upgrade the working copy to the current format</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="495"/> <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="559"/> <source>Subversion (pysvn)</source> <translation type="unfinished">Subversion (pysvn)</translation> </message> @@ -48434,17 +48826,17 @@ <translation>Aggiungi...</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="55"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="65"/> <source>Press to remove the selected documents from the database</source> <translation>Premi per rimuovere il documento selezionato dal database</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="58"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="68"/> <source>Remove</source> <translation>Rimuovi</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="117"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="132"/> <source>Add Documentation</source> <translation>Aggiungi documento</translation> </message> @@ -48454,40 +48846,50 @@ <translation>Qt Compressed Help Files (*.qch)</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="152"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="167"/> <source>Remove Documentation</source> <translation>Rimuovi documentazione</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="137"/> - <source>Do you really want to remove the selected documentation sets from the database?</source> - <translation>Vuoi veramente rimuovere la documentazione selezionata dal database ?</translation> - </message> - <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="107"/> - <source>The file <b>{0}</b> is not a valid Qt Help File.</source> - <translation>Il file <b>{0}</b> non è un file Qt Help valido.</translation> - </message> - <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="117"/> - <source>The namespace <b>{0}</b> is already registered.</source> - <translation>Il namespace <b>{0}</b> è già registrato.</translation> - </message> - <message> <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="152"/> + <source>Do you really want to remove the selected documentation sets from the database?</source> + <translation>Vuoi veramente rimuovere la documentazione selezionata dal database ?</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="122"/> + <source>The file <b>{0}</b> is not a valid Qt Help File.</source> + <translation>Il file <b>{0}</b> non è un file Qt Help valido.</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="132"/> + <source>The namespace <b>{0}</b> is already registered.</source> + <translation>Il namespace <b>{0}</b> è già registrato.</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="167"/> <source>Some documents currently opened reference the documentation you are attempting to remove. Removing the documentation will close those documents. Remove anyway?</source> <translation>Alcuni documenti aperti fanno riferimento a documenti che stai tentando di cancellare. Rimuovendo la documentazione verranno chiusi questi documenti. Rimuovere comunque ?</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="78"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="55"/> <source>Press to select QtHelp documents provided by a plug-in to add to the database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="81"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="58"/> <source>Add from Plug-ins...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="85"/> + <source>Select to manage the plug-in provided documentation sets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="88"/> + <source>Manage Plug-ins...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QtHelpDocumentationSelectionDialog</name> @@ -48501,6 +48903,61 @@ <source>Select the documentation files to be installed:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="144"/> + <source>Delete Documentation Sets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="91"/> + <source>Shall the selected documentation sets really be deleted?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="107"/> + <source><p>The documentation set <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="126"/> + <source>Shall the selected documentation set categories really be deleted?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="144"/> + <source>Shall all documentation sets really be deleted?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="56"/> + <source>Press to delete the selected documentation sets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="59"/> + <source>Delete</source> + <translation type="unfinished">Cancella</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="66"/> + <source>Press to delete the selected category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="69"/> + <source>Delete Categories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="76"/> + <source>Press to delete all entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="79"/> + <source>Delete All</source> + <translation type="unfinished">Cancella tutto</translation> + </message> </context> <context> <name>QtHelpFiltersDialog</name> @@ -49773,6 +50230,19 @@ </message> </context> <context> + <name>RestructuredTextProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/RestructuredTextProvider.py" line="411"/> + <source>Create List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/RestructuredTextProvider.py" line="411"/> + <source>Enter desired number of list elements:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>SafariImporter</name> <message> <location filename="../WebBrowser/Bookmarks/BookmarksImporters/SafariImporter.py" line="44"/> @@ -52924,52 +53394,52 @@ <translation>Esportazione del progetto dal repository Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/> <source>Subversion Error</source> <translation>Subversion Error</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="951"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>L'URL del repository del progetto non può essere recuperato dalla copia di lavoro. L'operazione di etichettatura verrà interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="998"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="978"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>L'URL del repository del progetto a un formato non valido. L'operazione di etichettatura verrà interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1093"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1073"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>L'URL del repository del progetto non può essere recuperato dalla copia di lavoro. L'operazione di switch verrà interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>L'URL del repository del progetto ha un formato non valido. L'operazione di switch verrà interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1512"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1492"/> <source>Subversion command</source> <translation>comando Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1779"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1759"/> <source>Subversion Set Property</source> <translation>Subversion Set Property</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1781"/> + <source>You have to supply a property name. Aborting.</source> + <translation>Devi fornire un nome per la proprietà. Interrompo.</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1801"/> - <source>You have to supply a property name. Aborting.</source> - <translation>Devi fornire un nome per la proprietà. Interrompo.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1821"/> <source>Subversion Delete Property</source> <translation>Subversion Delete Property</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1791"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1771"/> <source>Enter property name</source> <translation>Inserisci nome proprietà</translation> </message> @@ -52999,12 +53469,12 @@ <translation>Rimozione di file/directory al repository subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1056"/> <source>Reverting changes</source> <translation>Annullamento modifiche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1684"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1664"/> <source>Resolving conficts</source> <translation>Risoluzione conflitti</translation> </message> @@ -53031,45 +53501,45 @@ <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> <source>Subversion Log</source> - <translation>Log Subversion</translation> + <translation type="obsolete">Log Subversion</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> <source>Select number of entries to show.</source> - <translation>Mostra il numero di elementi da mostrare.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2100"/> + <translation type="obsolete">Mostra il numero di elementi da mostrare.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2080"/> <source>Locking in the Subversion repository</source> <translation>Blocco nel repository Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2108"/> <source>Unlocking in the Subversion repository</source> <translation>Sblocco del repository Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1923"/> <source>Property set.</source> <translation>Proprietà impostata.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1997"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1976"/> <source>Property deleted.</source> <translation>Proprietà cancellata.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/> <source>Subversion Lock</source> <translation>Lock Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/> <source>Enter lock comment</source> <translation>Inserico commento del lock</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2153"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2133"/> <source>Relocating</source> <translation>Movimentazione</translation> </message> @@ -53224,7 +53694,7 @@ <translation>non versionato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1984"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1964"/> <source>The svn process did not finish within 30s.</source> <translation>Il processo svn non è finito entro i 30s.</translation> </message> @@ -53234,27 +53704,27 @@ <translation>Non posso avviare l'eseguibile svn.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/> <source>Repository Browser</source> <translation>Visualizzatore del Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/> <source>Enter the repository URL.</source> <translation>Inserisci l'URL del repository.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2221"/> <source>Remove from changelist</source> <translation>Rimuovi dalla changelist</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/> <source>Add to changelist</source> <translation>Aggiungi alla changelist</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/> <source>Enter name of the changelist:</source> <translation>Inserisci il nome della changelist:</translation> </message> @@ -53284,27 +53754,27 @@ <translation>Spostamento di {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1033"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1013"/> <source>Tagging {0} in the Subversion repository</source> <translation>Tag di{0} nel repository subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1151"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1131"/> <source>Switching to {0}</source> <translation>Switch a {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1196"/> <source>Merging {0}</source> <translation>Merge di {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1482"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1462"/> <source>Cleaning up {0}</source> <translation>Pulizia di {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1695"/> <source>Copying {0}</source> <translation>copia di {0}</translation> </message> @@ -53320,7 +53790,7 @@ <translation>Committata la revisione {0}.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1255"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1234"/> <source>Revision {0}. </source> <translation>Revisione {0}. @@ -53337,37 +53807,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1042"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1987"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1967"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/> <source>Subversion Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Il file <b>{0}</b> non può essere letto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2305"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2285"/> <source>Upgrade</source> <translation type="unfinished"></translation> </message> @@ -54251,12 +54721,12 @@ <translation>Log Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="661"/> <source>Revision</source> <translation>Revisione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="658"/> <source>Author</source> <translation>Autore</translation> </message> @@ -54266,7 +54736,7 @@ <translation>Data</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="165"/> <source>Message</source> <translation>Messaggio</translation> </message> @@ -54306,97 +54776,97 @@ <translation>Inserisci il limite degli elementi da scaricare</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="261"/> <source>Press to generate a diff to the previous revision</source> <translation>Premi per generare un diff con la revisione precedente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="264"/> <source>&Diff to Previous</source> <translation>&Diff con il precedente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="271"/> <source>Press to compare two revisions</source> <translation>Premi per confrontare due revisioni</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> <source>&Compare Revisions</source> <translation>&Confronta revisioni</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="312"/> <source>Errors</source> <translation>Errori</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="318"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> <translation><b>Log errori Subversion</b><p>Mostra gli eventuali messaggi di errore del comando lvn log.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="334"/> <source>Input</source> <translation>Input</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="336"/> - <source>Press to send the input to the subversion process</source> - <translation>Premi per mandare l'input al processo subversion</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/> - <source>&Send</source> - <translation>&Spedisci</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="349"/> - <source>Enter data to be sent to the subversion process</source> - <translation>Inserisci i dati da mandare al processo subversion</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> - <source>Select to switch the input field to password mode</source> - <translation>Seleziona per impostare il campo di input in modalità password</translation> + <source>Press to send the input to the subversion process</source> + <translation>Premi per mandare l'input al processo subversion</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> - <source>&Password Mode</source> - <translation>Modo &Password</translation> + <source>&Send</source> + <translation>&Spedisci</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="369"/> + <source>Enter data to be sent to the subversion process</source> + <translation>Inserisci i dati da mandare al processo subversion</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="376"/> + <source>Select to switch the input field to password mode</source> + <translation>Seleziona per impostare il campo di input in modalità password</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="379"/> + <source>&Password Mode</source> + <translation>Modo &Password</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="382"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="89"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="93"/> <source>Added</source> <translation>Aggiunto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="90"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="94"/> <source>Deleted</source> <translation>Cancellato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="91"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="95"/> <source>Modified</source> <translation>Modificato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="504"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="527"/> <source>Subversion Error</source> <translation>Errore Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="313"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> @@ -54441,161 +54911,161 @@ <translation>Ferma su Copy/Move</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="313"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="96"/> <source>Replaced</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="294"/> <source>Select to show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="297"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnLogDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="81"/> <source>Added</source> - <translation>Aggiunto</translation> + <translation type="obsolete">Aggiunto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="82"/> <source>Deleted</source> - <translation>Cancellato</translation> + <translation type="obsolete">Cancellato</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="83"/> <source>Modified</source> - <translation>Modificato</translation> + <translation type="obsolete">Modificato</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="87"/> <source>revision</source> - <translation>revisione</translation> + <translation type="obsolete">revisione</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="14"/> <source>Subversion Log</source> - <translation>Log Subversion</translation> + <translation type="obsolete">Log Subversion</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="26"/> <source>Log</source> - <translation>Log</translation> + <translation type="obsolete">Log</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="32"/> <source><b>Subversion Log</b><p>This shows the output of the svn log command. By clicking on the links you may show the difference between versions.</p></source> - <translation><b>Log Subversion</b><p>Mostra l'output del comando svn log.Premendo sul link puoi vedere le differenze tra le versioni.</p></translation> + <translation type="obsolete"><b>Log Subversion</b><p>Mostra l'output del comando svn log.Premendo sul link puoi vedere le differenze tra le versioni.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="58"/> <source>Errors</source> - <translation>Errori</translation> + <translation type="obsolete">Errori</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="64"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> - <translation><b>Log errori Subversion</b><p>Mostra gli eventuali messaggi di errore del comando svn log.</p></translation> + <translation type="obsolete"><b>Log errori Subversion</b><p>Mostra gli eventuali messaggi di errore del comando svn log.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="80"/> <source>Input</source> - <translation>Input</translation> + <translation type="obsolete">Input</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="102"/> <source>Press to send the input to the subversion process</source> - <translation>Premi per mandare l'input al processo subversion</translation> + <translation type="obsolete">Premi per mandare l'input al processo subversion</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="105"/> <source>&Send</source> - <translation>&Spedisci</translation> + <translation type="obsolete">&Spedisci</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="108"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="115"/> <source>Enter data to be sent to the subversion process</source> - <translation>Inserisci i dati da mandare al processo subversion</translation> + <translation type="obsolete">Inserisci i dati da mandare al processo subversion</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="122"/> <source>Select to switch the input field to password mode</source> - <translation>Seleziona per impostare il campo di input in modalità password</translation> + <translation type="obsolete">Seleziona per impostare il campo di input in modalità password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="125"/> <source>&Password Mode</source> - <translation>Modo &Password</translation> + <translation type="obsolete">Modo &Password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="128"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> <source>Process Generation Error</source> - <translation>Errore Generazione Processo</translation> + <translation type="obsolete">Errore Generazione Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="55"/> <source><b>Processing your request, please wait...</b></source> - <translation><b>Esecuzione in corso, attendere prego...</b></translation> + <translation type="obsolete"><b>Esecuzione in corso, attendere prego...</b></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> + <translation type="obsolete">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="193"/> <source>diff to {0}</source> - <translation>diff su {0}</translation> + <translation type="obsolete">diff su {0}</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="202"/> <source><i>author: {0}</i><br /> </source> - <translation><i>autore: {0}</i><br /> + <translation type="obsolete"><i>autore: {0}</i><br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="205"/> <source><i>date: {0}</i><br /> </source> - <translation><i>data: {0}</i><br /> + <translation type="obsolete"><i>data: {0}</i><br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="191"/> <source> (copied from {0}, revision {1})</source> - <translation>(copiato da {0}, revisione {1})</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="42"/> - <source>Select to show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="45"/> - <source>Show differences side-by-side</source> - <translation type="unfinished"></translation> + <translation type="obsolete">(copiato da {0}, revisione {1})</translation> </message> </context> <context> @@ -54914,177 +55384,177 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="654"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="646"/> <source>Update from repository</source> <translation>Aggiorna da repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="658"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="650"/> <source>Commit changes to repository...</source> <translation>Consolida le modifica nel repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="656"/> <source>Add to repository</source> <translation>Aggiungi al repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="385"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="381"/> <source>Add tree to repository</source> <translation>Aggiungi albero al repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="660"/> <source>Remove from repository (and disk)</source> <translation>Rimuovi dal repository (e dal disco)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="566"/> <source>Show log</source> - <translation>Mostra log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="684"/> + <translation type="obsolete">Mostra log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="676"/> <source>Show status</source> <translation>Mostra stato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="696"/> <source>Revert changes</source> <translation>Annulla modifiche</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="700"/> + <source>Merge changes</source> + <translation>Fondi modifiche</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="708"/> - <source>Merge changes</source> - <translation>Fondi modifiche</translation> + <source>Set Property</source> + <translation>Imposta proprietà</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="710"/> + <source>List Properties</source> + <translation>Elenca proprietà</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="713"/> + <source>Delete Property</source> + <translation>Cancella proprietà</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="716"/> - <source>Set Property</source> - <translation>Imposta proprietà</translation> + <source>Select all local file entries</source> + <translation>Seleziona tutt i file locali</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="718"/> - <source>List Properties</source> - <translation>Elenca proprietà</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="721"/> - <source>Delete Property</source> - <translation>Cancella proprietà</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="724"/> - <source>Select all local file entries</source> - <translation>Seleziona tutt i file locali</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="726"/> <source>Select all versioned file entries</source> <translation>Seleziona tutti i file controllati</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="720"/> <source>Select all local directory entries</source> <translation>Seleziona tutte le directory locali</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="730"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="722"/> <source>Select all versioned directory entries</source> <translation>Seleziona tutte le directory controllate</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="430"/> + <source>Lock</source> + <translation>Lock</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="434"/> - <source>Lock</source> - <translation>Lock</translation> + <source>Unlock</source> + <translation>Unlock</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="438"/> - <source>Unlock</source> - <translation>Unlock</translation> + <source>Break Lock</source> + <translation>Spezza lock</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="442"/> - <source>Break Lock</source> - <translation>Spezza lock</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="446"/> <source>Steal Lock</source> <translation>Ruba lock</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="634"/> <source>Version Control</source> <translation>Controllo di Versione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="286"/> <source>Show annotated file</source> <translation>Mostra file appuntati</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="572"/> <source>Show repository info</source> <translation>Mostra informazioni del repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="562"/> <source>Show log browser</source> <translation>Mostra il browser dei log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="733"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="725"/> <source>Configure...</source> <translation>Configura...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="667"/> <source>Add to Changelist</source> <translation>Aggiungi alla Changelist</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="679"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="671"/> <source>Remove from Changelist</source> <translation>Rimuovi dalla Changelist</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="547"/> <source>Copy</source> <translation type="unfinished">Copia</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="549"/> <source>Move</source> <translation type="unfinished">Sposta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="681"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="271"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="267"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="693"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="685"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="276"/> <source>Show differences side-by-side (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="698"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="690"/> <source>Show differences (URLs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="712"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> @@ -55153,336 +55623,331 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/> - <source>Show log</source> - <translation>Mostra log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/> - <source>Show &log</source> - <translation>Mostra &log</translation> + <source>Show log browser</source> + <translation>Mostra browser log</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="104"/> - <source>Show the log of the local project</source> - <translation>Mostra i log del progetto locale</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation>Mostra un dialogo per navigare i log del progetto locale</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="107"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation><b>Mostra log</b><p>Mostra i log del progetto locale.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="131"/> + <translation type="obsolete"><b>Mostra log</b><p>Mostra i log del progetto locale.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/> <source>Show &difference</source> <translation>Mostra &differenza</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="121"/> <source>Show the difference of the local project to the repository</source> <translation>Mostra le differenze tra il progetto locale e il repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="137"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Mostra le differenze tra la revisione del progetto e il repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="164"/> <source>Show status</source> <translation>Mostra stato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="164"/> <source>Show &status</source> <translation>Mostra &stato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="169"/> <source>Show the status of the local project</source> <translation>Mostra lo stato del progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="172"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Mostra stato</b><p>Mostra lo stato del progetto locale.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="195"/> + <source>Tag in repository</source> + <translation>Tag nel repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="195"/> + <source>&Tag in repository...</source> + <translation>&Tag nel repository...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="200"/> + <source>Tag the local project in the repository</source> + <translation>Tag del progetto locale nel repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="203"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Tag nel repository</b><p>Tag del progetto locale nel repository.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="210"/> - <source>Tag in repository</source> - <translation>Tag nel repository</translation> + <source>Export from repository</source> + <translation>Esporta dal repository</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="210"/> - <source>&Tag in repository...</source> - <translation>&Tag nel repository...</translation> + <source>&Export from repository...</source> + <translation>&Esporta dal repository...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="215"/> - <source>Tag the local project in the repository</source> - <translation>Tag del progetto locale nel repository</translation> + <source>Export a project from the repository</source> + <translation>Esporta un progetto dal repositoty</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="218"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Tag nel repository</b><p>Tag del progetto locale nel repository.</p></translation> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>Esporta dal repository</b><p>Esporta un progetto dal repository.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/> - <source>Export from repository</source> - <translation>Esporta dal repository</translation> + <source>Command options</source> + <translation>Opzione comando</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/> - <source>&Export from repository...</source> - <translation>&Esporta dal repository...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="230"/> - <source>Export a project from the repository</source> - <translation>Esporta un progetto dal repositoty</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="233"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation><b>Esporta dal repository</b><p>Esporta un progetto dal repository.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="240"/> - <source>Command options</source> - <translation>Opzione comando</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="240"/> <source>Command &options...</source> <translation>&Opzioni comando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="229"/> <source>Show the VCS command options</source> <translation>Mostra le opzioni del comando VCS</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="231"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation><b>Opzioni comando...</b><p>Mostra un dialogo per modificare le opzioni del comando VCS.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="238"/> + <source>Revert changes</source> + <translation>Inverti modifiche</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="238"/> + <source>Re&vert changes</source> + <translation>In&verti modifiche</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="243"/> + <source>Revert all changes made to the local project</source> + <translation>Inverti tutte le modifiche fatte al progetto locale</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="246"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation><b>Opzioni comando...</b><p>Mostra un dialogo per modificare le opzioni del comando VCS.</p></translation> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation><b>Inverti modifiche</b><p>Inverte tutte le modifiche fatte al progetto locale.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/> - <source>Revert changes</source> - <translation>Inverti modifiche</translation> + <source>Merge</source> + <translation>Fondi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/> - <source>Re&vert changes</source> - <translation>In&verti modifiche</translation> + <source>Mer&ge changes...</source> + <translation>Fon&di modifiche...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="258"/> - <source>Revert all changes made to the local project</source> - <translation>Inverti tutte le modifiche fatte al progetto locale</translation> + <source>Merge changes of a tag/revision into the local project</source> + <translation>Fondi le modifiche del tag/revision nel progetto locale</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="261"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation><b>Inverti modifiche</b><p>Inverte tutte le modifiche fatte al progetto locale.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="268"/> - <source>Merge</source> - <translation>Fondi</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="268"/> - <source>Mer&ge changes...</source> - <translation>Fon&di modifiche...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="273"/> - <source>Merge changes of a tag/revision into the local project</source> - <translation>Fondi le modifiche del tag/revision nel progetto locale</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="276"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Fondi</b><p>Fonde le modifiche del tag/revisione nel progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="269"/> <source>Switch</source> <translation>Scambia</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="269"/> <source>S&witch...</source> <translation>&Scambia...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="274"/> <source>Switch the local copy to another tag/branch</source> <translation>Cambia la copia locale ad un altro tag/branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="277"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>Cambia</b><p>Cambia la copia locale ad un altro tag/branch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> <source>Cleanup</source> <translation>Pulisci</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> <source>Cleanu&p</source> <translation>&Pulisci</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="303"/> <source>Cleanup the local project</source> <translation>Pulisci il progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="306"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Pulizia</b><p>Esegue la pulizia del progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="328"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="313"/> <source>Execute command</source> <translation>Esegui comando</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="328"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="313"/> <source>E&xecute command...</source> <translation>&Esegui comando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="317"/> <source>Execute an arbitrary VCS command</source> <translation>Esegui un comando VCS arbitrario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="320"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation><b>Esegui comando</b><p>Apre un dialogo per inserire un comando VCS arbitraio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="327"/> <source>List tags</source> <translation>Elenca tag</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="327"/> <source>List tags...</source> <translation>Elenca tag...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="331"/> <source>List tags of the project</source> <translation>Elenca i tag del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="334"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Elenca tag</b><p>Elenca i tag del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="341"/> <source>List branches</source> <translation>Elenca branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="341"/> <source>List branches...</source> <translation>Elenca branches...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="345"/> <source>List branches of the project</source> <translation>Elenca i branches del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="348"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Elenca branches</b><p>Elenca i branch del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="355"/> <source>List repository contents</source> <translation>Elenca contenuti repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="355"/> <source>List repository contents...</source> <translation>Elenca contenuti repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="374"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="359"/> <source>Lists the contents of the repository</source> <translation>Elenca i contenuti del repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="377"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="362"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation><b>Elanca contenuti del repository</b><p>Elenca i contenuti del repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="369"/> <source>Set Property</source> <translation>Imposta proprietà</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="369"/> <source>Set Property...</source> <translation>Imposta proprietà...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="373"/> <source>Set a property for the project files</source> <translation>Imposta una proprietà per i file del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="376"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation><b>Imposta proprietà</b><p>Imposta una proprietà per i file del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="383"/> <source>List Properties</source> <translation>Elenca proprietà</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="383"/> <source>List Properties...</source> <translation>Elenca proprietà...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="387"/> <source>List properties of the project files</source> <translation>Elenca le proprietà dei file del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="390"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation><b>Elenca proprietà</b><p>Elenca le proprietàd ei file del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="397"/> <source>Delete Property</source> <translation>Cancella proprietà</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="397"/> <source>Delete Property...</source> <translation>Cancella proprietà...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="416"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="401"/> <source>Delete a property for the project files</source> <translation>Cancella una proprietà per i file del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="419"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="404"/> <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> <translation><b>Cancella proprietà</b><p>Cancella una proprietà per i file del progetto.</p></translation> </message> @@ -55497,22 +55962,22 @@ <translation type="obsolete">Mostra alcune informazioni relative al repository del progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="426"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/> <source>Relocate</source> <translation>Rialloca</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="426"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/> <source>Relocate...</source> <translation>Rialloca...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="431"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="416"/> <source>Relocate the working copy to a new repository URL</source> <translation>Rialloca la copia di lavoro ad una nuovo URL del repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="434"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="419"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>Rialloca</b><p>Rialloca la copia di lavoro ad una nuovo URL del repository.</p></translation> </message> @@ -55522,152 +55987,142 @@ <translation type="obsolete"><b>Mostra informazioni Repository</b><p>Mostra alcune informazioni relative al repository del progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="153"/> <source>Show the difference of the project between two repository URLs</source> <translation>Mostra le differenze del progetto tra due URL del repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="114"/> - <source>Show log browser</source> - <translation>Mostra browser log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="119"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>Mostra un dialogo per navigare i log del progetto locale</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="122"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="107"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Mostra borwser log</b><p>Mostra un dialogo per navigare i log del progetto locale. Inizialmente viene mostrato un numero limitato di elementi. Altri possono essere scaricati in seguito.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="427"/> + <source>Repository Browser</source> + <translation>Browser Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="427"/> + <source>Repository Browser...</source> + <translation>Browser Repository...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="432"/> + <source>Show the Repository Browser dialog</source> + <translation>Mostra il dialogo del Browser di repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="435"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation><b>Browser Repository</b><p>Mostra il dialogo del Browser del repository.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> - <source>Repository Browser</source> - <translation>Browser Repository</translation> + <source>Configure</source> + <translation>Configura</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> - <source>Repository Browser...</source> - <translation>Browser Repository...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="447"/> - <source>Show the Repository Browser dialog</source> - <translation>Mostra il dialogo del Browser di repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="450"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation><b>Browser Repository</b><p>Mostra il dialogo del Browser del repository.</p></translation> + <source>Configure...</source> + <translation>Configura...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="446"/> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation>Mostra il dialogo di configurazione con la pagina di Subversion selezionata</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="449"/> + <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> + <translation><b>Configura</b><p>Mostra il dialogo di configurazione con la pagina di Subversion selezionata.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="288"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="291"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <source>Show change lists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="184"/> + <source>Show the change lists and associated files of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="187"/> + <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> - <source>Configure</source> - <translation>Configura</translation> + <source>Upgrade</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> - <source>Configure...</source> - <translation>Configura...</translation> + <source>Upgrade...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="461"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation>Mostra il dialogo di configurazione con la pagina di Subversion selezionata</translation> + <source>Upgrade the working copy to the current format</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="464"/> - <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> - <translation><b>Configura</b><p>Mostra il dialogo di configurazione con la pagina di Subversion selezionata.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="303"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="306"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="194"/> - <source>Show change lists</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="199"/> - <source>Show the change lists and associated files of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="202"/> - <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="472"/> - <source>Upgrade</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="472"/> - <source>Upgrade...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="476"/> - <source>Upgrade the working copy to the current format</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="479"/> <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="132"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="148"/> <source>Show differences (URLs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="124"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="140"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="156"/> <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="559"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="543"/> <source>Subversion (svn)</source> <translation type="unfinished">Subversion (svn)</translation> </message> @@ -59889,12 +60344,12 @@ <translation>Tutti</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="66"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="62"/> <source>Language:</source> <translation>Linguaggio:</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="70"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="69"/> <source>GROUP</source> <translation>GRUPPO</translation> </message> @@ -59939,12 +60394,12 @@ <translation>Gruppo:</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="103"/> <source>Close dialog</source> <translation>Chiudi dialogo</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="103"/> <source>Do you really want to close the dialog?</source> <translation>Vuoi veramente chiudere questo dialogo ?</translation> </message> @@ -61713,7 +62168,7 @@ <context> <name>UnittestDialog</name> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.py" line="403"/> <source>Unittest</source> <translation>Unittest</translation> </message> @@ -61728,17 +62183,17 @@ <translation>^Error: </translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="266"/> + <location filename="../PyUnit/UnittestDialog.py" line="269"/> <source>You must enter a test suite file.</source> <translation>Devi inserire il file di una suite di test.</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="274"/> + <location filename="../PyUnit/UnittestDialog.py" line="277"/> <source>Preparing Testsuite</source> <translation>Preparazione Testsuite</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="469"/> + <location filename="../PyUnit/UnittestDialog.py" line="475"/> <source>Running</source> <translation>In esecuzione</translation> </message> @@ -61920,42 +62375,42 @@ <translation><b>Ferma test</b><p>Questo pulsante ferma una unitttest in esecuzione.</p></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="634"/> + <location filename="../PyUnit/UnittestDialog.py" line="640"/> <source>Show Source</source> <translation>Mostra sorgenti</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="206"/> + <location filename="../PyUnit/UnittestDialog.py" line="209"/> <source>Python Files (*.py);;All Files (*)</source> <translation>File Python (*.py);;Tutti i File (*)</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="202"/> + <location filename="../PyUnit/UnittestDialog.py" line="205"/> <source>Python3 Files ({1});;Python2 Files ({0});;All Files (*)</source> <translation>File Python3 ({0});;File Python1({1});;Tutti i File (*)</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.py" line="403"/> <source><p>Unable to run test <b>{0}</b>.<br>{1}<br>{2}</p></source> <translation><p>Impossibile eseguire test <b>{0}</b>.<br>{1}<br>{2}</p></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="493"/> + <location filename="../PyUnit/UnittestDialog.py" line="499"/> <source>Ran {0} test in {1:.3f}s</source> <translation>Eseguiti {0} test in {1:.3f} s</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="497"/> + <location filename="../PyUnit/UnittestDialog.py" line="503"/> <source>Ran {0} tests in {1:.3f}s</source> <translation>Eseguiti {0} test in {1:.3f} s</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="514"/> + <location filename="../PyUnit/UnittestDialog.py" line="520"/> <source>Failure: {0}</source> <translation>Fallimenti: {0}</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="529"/> + <location filename="../PyUnit/UnittestDialog.py" line="535"/> <source>Error: {0}</source> <translation>Errori: {0}</translation> </message> @@ -61990,17 +62445,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="544"/> + <location filename="../PyUnit/UnittestDialog.py" line="550"/> <source> Skipped: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="559"/> + <location filename="../PyUnit/UnittestDialog.py" line="565"/> <source> Expected Failure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="573"/> + <location filename="../PyUnit/UnittestDialog.py" line="579"/> <source> Unexpected Success</source> <translation type="unfinished"></translation> </message> @@ -64380,7 +64835,7 @@ <context> <name>Utilities</name> <message> - <location filename="../Utilities/__init__.py" line="1400"/> + <location filename="../Utilities/__init__.py" line="1403"/> <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> @@ -64606,8 +65061,8 @@ <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="81"/> <source><b>Globals Filter List</b> -<p>Select the variable types you want to be filtered out of the globals variables list.</p<</source> - <translation><b>Lista filtri globali</b> +<p>Select the variable types you want to be shown in the global variables viewer.</p<</source> + <translation type="unfinished"><b>Lista filtri globali</b> <p>Seleziona il tipo di variabile che vuoi sia esclusa dalla lista delle variabili globali.</p></translation> </message> <message> @@ -64618,25 +65073,30 @@ <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="61"/> <source><b>Locals Filter List</b> -<p>Select the variable types you want to be filtered out of the locals variables list.</p<</source> - <translation><b>Lista filtri locali</b> +<p>Select the variable types you want to be shown in the local variables viewer.</p<</source> + <translation type="unfinished"><b>Lista filtri locali</b> <p>Seleziona il tipo di variabile che vuoi sia esclusa dalla lista delle variabili locali.</p></translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="48"/> - <source>&Globals Filter</source> - <translation>Filtri &Globali</translation> + <source>&Globals Viewer</source> + <translation type="unfinished">Filtri &Globali</translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="38"/> - <source>&Locals Filter</source> - <translation>Filtri &Locali</translation> + <source>&Locals Viewer</source> + <translation type="unfinished">Filtri &Locali</translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.py" line="42"/> <source>Save Default</source> <translation>Salva default</translation> </message> + <message> + <location filename="../Debugger/VariablesFilterDialog.ui" line="28"/> + <source>Select the variable types to be shown in the variables viewers:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VariablesViewer</name> @@ -65212,7 +65672,7 @@ <translation>Aggiorna</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="532"/> + <location filename="../VCS/ProjectHelper.py" line="533"/> <source>The project should be reread. Do this now?</source> <translation>Il progetto deve essere riletto. Farlo ora ?</translation> </message> @@ -65227,7 +65687,7 @@ <translation>Il progetto scaricato dal repository non contiene un file progetto di eric ((*.e4p). Crearlo ?</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="532"/> + <location filename="../VCS/ProjectHelper.py" line="533"/> <source>Switch</source> <translation>Commutare</translation> </message> @@ -65307,17 +65767,17 @@ <context> <name>VersionControl</name> <message> - <location filename="../VCS/VersionControl.py" line="573"/> + <location filename="../VCS/VersionControl.py" line="563"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="../VCS/VersionControl.py" line="704"/> + <location filename="../VCS/VersionControl.py" line="694"/> <source>Repository status checking is switched off</source> <translation>Il controllo dello stato del repository è spento</translation> </message> <message> - <location filename="../VCS/VersionControl.py" line="573"/> + <location filename="../VCS/VersionControl.py" line="563"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> @@ -72586,24 +73046,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1459"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1426"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Origine #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tags</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1446"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -72612,24 +73072,24 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Origini</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -72639,12 +73099,12 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Segnalibri</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -72661,13 +73121,13 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2078"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2083"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> @@ -73342,50 +73802,55 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="240"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="243"/> <source>do not assign a lambda expression, use a def</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="243"/> - <source>ambiguous variable name '{0}'</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="246"/> - <source>ambiguous class definition '{0}'</source> + <source>ambiguous variable name '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="249"/> - <source>ambiguous function definition '{0}'</source> + <source>ambiguous class definition '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="252"/> - <source>{0}: {1}</source> - <translation type="unfinished">{0}: {1}</translation> + <source>ambiguous function definition '{0}'</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="255"/> + <source>{0}: {1}</source> + <translation type="unfinished">{0}: {1}</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="258"/> <source>{0}</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="240"/> + <source>do not use bare except</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>subversion</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1741"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1720"/> <source>unknown</source> <translation>sconosciuto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1606"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1586"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Informazioni Repository</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Revisione corrente </b></td><td>{2}</td></tr><tr><td><b>Revisione committata</b></td><td>{3}</td></tr><tr><td><b>Data della commit</b></td><td>{4}</td></tr><tr><td><b>Ora della commit</b></td><td>{5}</td></tr><tr><td><b>Ultimo autore</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1746"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1725"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Informazioni Repository</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Revisione corrente</b></td><td>{4}</td></tr><tr><td><b>Revisione Committata</b></td><td>{5}</td></tr><tr><td><b>Data della commit</b></td><td>{6}</td></tr><tr><td><b>Ora della commit</b></td><td>{7}</td></tr><tr><td><b>Ultimo autore</b></td><td>{8}</td></tr></table></translation> </message>
diff -r 852016bbdedb -r c307358a2ecc i18n/eric6_pt.ts --- a/i18n/eric6_pt.ts Fri Jan 27 19:18:52 2017 +0100 +++ b/i18n/eric6_pt.ts Fri Feb 03 19:20:59 2017 +0100 @@ -3640,147 +3640,147 @@ <context> <name>CodeStyleFixer</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="494"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> <source>Triple single quotes converted to triple double quotes.</source> <translation>Três aspas simples convertidas a três aspas duplas.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> - <source>Introductory quotes corrected to be {0}"""</source> - <translation>Corrigidas as aspas introdutórias para ser {0}"""</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="500"/> - <source>Single line docstring put on one line.</source> - <translation>Docstring de linha única posta numa linha.</translation> + <source>Introductory quotes corrected to be {0}"""</source> + <translation>Corrigidas as aspas introdutórias para ser {0}"""</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="503"/> + <source>Single line docstring put on one line.</source> + <translation>Docstring de linha única posta numa linha.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="506"/> <source>Period added to summary line.</source> <translation>Ponto adicionado à linha sumário.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> <source>Blank line before function/method docstring removed.</source> <translation>Retirada a linha vazia antes da docstring de função/método.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="509"/> - <source>Blank line inserted before class docstring.</source> - <translation>Linha branca inserida antes da docstring de classe.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="512"/> - <source>Blank line inserted after class docstring.</source> - <translation>Inserida linha vazia depois da docstring de classe.</translation> + <source>Blank line inserted before class docstring.</source> + <translation>Linha branca inserida antes da docstring de classe.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="515"/> - <source>Blank line inserted after docstring summary.</source> - <translation>Inserida linha vazia depois da docstring de sumário.</translation> + <source>Blank line inserted after class docstring.</source> + <translation>Inserida linha vazia depois da docstring de classe.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="518"/> - <source>Blank line inserted after last paragraph of docstring.</source> - <translation>Inserida linha vazia depois do último parágrafo da docstring.</translation> + <source>Blank line inserted after docstring summary.</source> + <translation>Inserida linha vazia depois da docstring de sumário.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="521"/> - <source>Leading quotes put on separate line.</source> - <translation>Aspas iniciais postas numa linha separada.</translation> + <source>Blank line inserted after last paragraph of docstring.</source> + <translation>Inserida linha vazia depois do último parágrafo da docstring.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="524"/> - <source>Trailing quotes put on separate line.</source> - <translation>Aspas finais postas numa linha separada.</translation> + <source>Leading quotes put on separate line.</source> + <translation>Aspas iniciais postas numa linha separada.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="527"/> + <source>Trailing quotes put on separate line.</source> + <translation>Aspas finais postas numa linha separada.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> <source>Blank line before class docstring removed.</source> <translation>Retirada linha vazia antes da docstring de classe.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> - <source>Blank line after class docstring removed.</source> - <translation>Retirada linha vazia depois da docstring de classe.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="536"/> - <source>Blank line after function/method docstring removed.</source> - <translation>Retirada a linha vazia depois da docstring de função/método.</translation> + <source>Blank line after class docstring removed.</source> + <translation>Retirada linha vazia depois da docstring de classe.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="539"/> - <source>Blank line after last paragraph removed.</source> - <translation>Retirada linha vazia depois do último parágrafo.</translation> + <source>Blank line after function/method docstring removed.</source> + <translation>Retirada a linha vazia depois da docstring de função/método.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="542"/> - <source>Tab converted to 4 spaces.</source> - <translation>Tabulação convertida a 4 espaços.</translation> + <source>Blank line after last paragraph removed.</source> + <translation>Retirada linha vazia depois do último parágrafo.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="545"/> - <source>Indentation adjusted to be a multiple of four.</source> - <translation>Ajustada a indentação a múltiplos de quatro.</translation> + <source>Tab converted to 4 spaces.</source> + <translation>Tabulação convertida a 4 espaços.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="548"/> - <source>Indentation of continuation line corrected.</source> - <translation>Corrigida a indentação da linha de continuação.</translation> + <source>Indentation adjusted to be a multiple of four.</source> + <translation>Ajustada a indentação a múltiplos de quatro.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="551"/> - <source>Indentation of closing bracket corrected.</source> - <translation>Corrigida a indentação de parêntesis de fecho.</translation> + <source>Indentation of continuation line corrected.</source> + <translation>Corrigida a indentação da linha de continuação.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="554"/> - <source>Missing indentation of continuation line corrected.</source> - <translation>Corrigida falta de indentação na linha de continuação.</translation> + <source>Indentation of closing bracket corrected.</source> + <translation>Corrigida a indentação de parêntesis de fecho.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="557"/> - <source>Closing bracket aligned to opening bracket.</source> - <translation>Parêntesis de fecho alinhado com parêntesis de abertura.</translation> + <source>Missing indentation of continuation line corrected.</source> + <translation>Corrigida falta de indentação na linha de continuação.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="560"/> - <source>Indentation level changed.</source> - <translation>Alterado o nível da indentação.</translation> + <source>Closing bracket aligned to opening bracket.</source> + <translation>Parêntesis de fecho alinhado com parêntesis de abertura.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="563"/> - <source>Indentation level of hanging indentation changed.</source> - <translation>Alterado o nível da indentação pendente.</translation> + <source>Indentation level changed.</source> + <translation>Alterado o nível da indentação.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="566"/> + <source>Indentation level of hanging indentation changed.</source> + <translation>Alterado o nível da indentação pendente.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="569"/> <source>Visual indentation corrected.</source> <translation>Indentação visual corrigida.</translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="584"/> + <source>Extraneous whitespace removed.</source> + <translation>Espaço estranho retirado.</translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="581"/> - <source>Extraneous whitespace removed.</source> - <translation>Espaço estranho retirado.</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="578"/> <source>Missing whitespace added.</source> <translation>Adicionado espaço branco em falta.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="584"/> - <source>Whitespace around comment sign corrected.</source> - <translation>Corrigido espaço em volta do símbolo de comentário.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="587"/> + <source>Whitespace around comment sign corrected.</source> + <translation>Corrigido espaço em volta do símbolo de comentário.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="590"/> <source>One blank line inserted.</source> <translation>Inserida uma linha vazia.</translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="591"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> <source>%n blank line(s) inserted.</source> <translation> <numerusform>inserida uma linha vazia.</numerusform> @@ -3788,7 +3788,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="597"/> <source>%n superfluous lines removed</source> <translation> <numerusform>retirada uma linha desnecessária</numerusform> @@ -3796,77 +3796,77 @@ </translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="598"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="601"/> <source>Superfluous blank lines removed.</source> <translation>Retiradas linhas vazias desnecessárias.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="601"/> - <source>Superfluous blank lines after function decorator removed.</source> - <translation>Retiradas linhas vazias desnecessárias após o decorador de função.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="604"/> - <source>Imports were put on separate lines.</source> - <translation>Imports foram postos em linhas separadas.</translation> + <source>Superfluous blank lines after function decorator removed.</source> + <translation>Retiradas linhas vazias desnecessárias após o decorador de função.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="607"/> - <source>Long lines have been shortened.</source> - <translation>Foram encolhidas as linhas compridas.</translation> + <source>Imports were put on separate lines.</source> + <translation>Imports foram postos em linhas separadas.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="610"/> + <source>Long lines have been shortened.</source> + <translation>Foram encolhidas as linhas compridas.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="613"/> <source>Redundant backslash in brackets removed.</source> <translation>Retirada barra invertida redundante entre parêntesis.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="616"/> - <source>Compound statement corrected.</source> - <translation>Instrução composta corrigida.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="619"/> - <source>Comparison to None/True/False corrected.</source> - <translation>Corrigida a comparação a None/True/False.</translation> + <source>Compound statement corrected.</source> + <translation>Instrução composta corrigida.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="622"/> - <source>'{0}' argument added.</source> - <translation>Adicionado o argumento '{0}'.</translation> + <source>Comparison to None/True/False corrected.</source> + <translation>Corrigida a comparação a None/True/False.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="625"/> - <source>'{0}' argument removed.</source> - <translation>Removido o argumento '{0}'.</translation> + <source>'{0}' argument added.</source> + <translation>Adicionado o argumento '{0}'.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="628"/> - <source>Whitespace stripped from end of line.</source> - <translation>Eliminado o espaço no fim de linha.</translation> + <source>'{0}' argument removed.</source> + <translation>Removido o argumento '{0}'.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="631"/> - <source>newline added to end of file.</source> - <translation>adicionada uma linha nova ao fim do ficheiro.</translation> + <source>Whitespace stripped from end of line.</source> + <translation>Eliminado o espaço no fim de linha.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="634"/> - <source>Superfluous trailing blank lines removed from end of file.</source> - <translation>Retiradas linhas vazias desnecessárias do fim do ficheiro.</translation> + <source>newline added to end of file.</source> + <translation>adicionada uma linha nova ao fim do ficheiro.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="637"/> + <source>Superfluous trailing blank lines removed from end of file.</source> + <translation>Retiradas linhas vazias desnecessárias do fim do ficheiro.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="640"/> <source>'<>' replaced by '!='.</source> <translation>'<>' substituido por '!='.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="641"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="644"/> <source>Could not save the file! Skipping it. Reason: {0}</source> <translation>Não se pode gravar ficheiro! Saltando-o. Motivo: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="710"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="713"/> <source> no message defined for code '{0}'</source> <translation> sem mensagem definida para código '{0}'</translation> </message> @@ -7397,197 +7397,197 @@ <context> <name>DocStyleChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="260"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="263"/> <source>module is missing a docstring</source> <translation>falta uma docstring ao modulo</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="262"/> - <source>public function/method is missing a docstring</source> - <translation>falta uma docstring ao método/função pública</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="265"/> - <source>private function/method may be missing a docstring</source> - <translation>pode faltar uma docstring ao método/função privada</translation> + <source>public function/method is missing a docstring</source> + <translation>falta uma docstring ao método/função pública</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="268"/> + <source>private function/method may be missing a docstring</source> + <translation>pode faltar uma docstring ao método/função privada</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="271"/> <source>public class is missing a docstring</source> <translation>falta uma docstring à classe pública</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="270"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="273"/> <source>private class may be missing a docstring</source> <translation>pode faltar uma docstring à classe privada</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="272"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="275"/> <source>docstring not surrounded by """</source> <translation>docstring não envolvida por """</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="274"/> - <source>docstring containing \ not surrounded by r"""</source> - <translation>docstring contém \ não envolvida por r"""</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="277"/> - <source>docstring containing unicode character not surrounded by u"""</source> - <translation>docstring contém carácteres unicódigo não envolvida por u"""</translation> + <source>docstring containing \ not surrounded by r"""</source> + <translation>docstring contém \ não envolvida por r"""</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="280"/> + <source>docstring containing unicode character not surrounded by u"""</source> + <translation>docstring contém carácteres unicódigo não envolvida por u"""</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="283"/> <source>one-liner docstring on multiple lines</source> <translation>docstring de uma linha em múltiplas linhas</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="282"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="285"/> <source>docstring has wrong indentation</source> <translation>docstring tem indentação errada</translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="328"/> + <source>docstring summary does not end with a period</source> + <translation>sumário de docstring não termina com um ponto final</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="291"/> + <source>docstring summary is not in imperative mood (Does instead of Do)</source> + <translation>sumário de docstring não está no modo imperativo (Faz em vez de Faça)</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="295"/> + <source>docstring summary looks like a function's/method's signature</source> + <translation>sumário de docstring parece uma assinatura de método/função</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="298"/> + <source>docstring does not mention the return value type</source> + <translation>docstring não menciona o tipo de valor devolvido</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="301"/> + <source>function/method docstring is separated by a blank line</source> + <translation>docstring de método/função está separada por uma linha em branco</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="304"/> + <source>class docstring is not preceded by a blank line</source> + <translation>docstring de class não antecedida por uma linha em branco</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="307"/> + <source>class docstring is not followed by a blank line</source> + <translation>docstring de classe não está seguida por uma linha em branco</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="362"/> + <source>docstring summary is not followed by a blank line</source> + <translation>sumário de docstring não seguido por uma linha em branco</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="313"/> + <source>last paragraph of docstring is not followed by a blank line</source> + <translation>último parágrafo da docstring não está seguido por uma linha em branco</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="317"/> + <source>private function/method is missing a docstring</source> + <translation>falta uma docstring ao método/função privado</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="320"/> + <source>private class is missing a docstring</source> + <translation>falta uma docstring à classe privada</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="322"/> + <source>leading quotes of docstring not on separate line</source> + <translation>aspas iniciais da docstring não estão em linha separada</translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="325"/> - <source>docstring summary does not end with a period</source> - <translation>sumário de docstring não termina com um ponto final</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="288"/> - <source>docstring summary is not in imperative mood (Does instead of Do)</source> - <translation>sumário de docstring não está no modo imperativo (Faz em vez de Faça)</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="292"/> - <source>docstring summary looks like a function's/method's signature</source> - <translation>sumário de docstring parece uma assinatura de método/função</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="295"/> - <source>docstring does not mention the return value type</source> - <translation>docstring não menciona o tipo de valor devolvido</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="298"/> - <source>function/method docstring is separated by a blank line</source> - <translation>docstring de método/função está separada por uma linha em branco</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="301"/> - <source>class docstring is not preceded by a blank line</source> - <translation>docstring de class não antecedida por uma linha em branco</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="304"/> - <source>class docstring is not followed by a blank line</source> - <translation>docstring de classe não está seguida por uma linha em branco</translation> + <source>trailing quotes of docstring not on separate line</source> + <translation>aspas de fecho da docstring não estão numa linha separada</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="332"/> + <source>docstring does not contain a @return line but function/method returns something</source> + <translation>docstring sem linha @return mas a função/método devolve algo</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="336"/> + <source>docstring contains a @return line but function/method doesn't return anything</source> + <translation>docstring com linha @return mas a função/método não devolve nada</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="340"/> + <source>docstring does not contain enough @param/@keyparam lines</source> + <translation>docstring sem linhas @param/@keyparam suficientes</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="343"/> + <source>docstring contains too many @param/@keyparam lines</source> + <translation>docstring com demasiadas linhas @param/@keyparam</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="346"/> + <source>keyword only arguments must be documented with @keyparam lines</source> + <translation>argumentos de palavra chave devem de estar documentados com linhas @keyparam</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="349"/> + <source>order of @param/@keyparam lines does not match the function/method signature</source> + <translation>ordem das linhas @param/@keyparam não coincidem com a assinatura de função/método</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="352"/> + <source>class docstring is preceded by a blank line</source> + <translation>docstring de classe está antecedida por uma linha em branco</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="354"/> + <source>class docstring is followed by a blank line</source> + <translation>docstring de classe está seguida por uma linha em branco</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="356"/> + <source>function/method docstring is preceded by a blank line</source> + <translation>docstring de função/método precedida por uma linha em branco</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="359"/> - <source>docstring summary is not followed by a blank line</source> - <translation>sumário de docstring não seguido por uma linha em branco</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="310"/> - <source>last paragraph of docstring is not followed by a blank line</source> - <translation>último parágrafo da docstring não está seguido por uma linha em branco</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="314"/> - <source>private function/method is missing a docstring</source> - <translation>falta uma docstring ao método/função privado</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="317"/> - <source>private class is missing a docstring</source> - <translation>falta uma docstring à classe privada</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="319"/> - <source>leading quotes of docstring not on separate line</source> - <translation>aspas iniciais da docstring não estão em linha separada</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="322"/> - <source>trailing quotes of docstring not on separate line</source> - <translation>aspas de fecho da docstring não estão numa linha separada</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="329"/> - <source>docstring does not contain a @return line but function/method returns something</source> - <translation>docstring sem linha @return mas a função/método devolve algo</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="333"/> - <source>docstring contains a @return line but function/method doesn't return anything</source> - <translation>docstring com linha @return mas a função/método não devolve nada</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="337"/> - <source>docstring does not contain enough @param/@keyparam lines</source> - <translation>docstring sem linhas @param/@keyparam suficientes</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="340"/> - <source>docstring contains too many @param/@keyparam lines</source> - <translation>docstring com demasiadas linhas @param/@keyparam</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="343"/> - <source>keyword only arguments must be documented with @keyparam lines</source> - <translation>argumentos de palavra chave devem de estar documentados com linhas @keyparam</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="346"/> - <source>order of @param/@keyparam lines does not match the function/method signature</source> - <translation>ordem das linhas @param/@keyparam não coincidem com a assinatura de função/método</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="349"/> - <source>class docstring is preceded by a blank line</source> - <translation>docstring de classe está antecedida por uma linha em branco</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="351"/> - <source>class docstring is followed by a blank line</source> - <translation>docstring de classe está seguida por uma linha em branco</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="353"/> - <source>function/method docstring is preceded by a blank line</source> - <translation>docstring de função/método precedida por uma linha em branco</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="356"/> <source>function/method docstring is followed by a blank line</source> <translation>docstring de função/método seguida de uma linha em branco</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="362"/> - <source>last paragraph of docstring is followed by a blank line</source> - <translation>último parágrafo da docstring seguido de uma linha em branco</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="365"/> + <source>last paragraph of docstring is followed by a blank line</source> + <translation>último parágrafo da docstring seguido de uma linha em branco</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="368"/> <source>docstring does not contain a @exception line but function/method raises an exception</source> <translation>docstring sem linha @exception mas a função/método cria uma exceção</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="369"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="372"/> <source>docstring contains a @exception line but function/method doesn't raise an exception</source> <translation>docstring contém uma linha @exception mas o método/função não levanta uma exceção</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="374"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="377"/> <source>{0}: {1}</source> <translation>{0}: {1}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="284"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="287"/> <source>docstring does not contain a summary</source> <translation>docstring não contém um sumário</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="327"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="330"/> <source>docstring summary does not start with '{0}'</source> <translation>sumário de docstring não começa com '{0}'</translation> </message> @@ -9386,127 +9386,127 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2878"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source>Open File</source> <translation>Abrir Ficheiro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="340"/> + <location filename="../QScintilla/Editor.py" line="343"/> <source><p>The size of the file <b>{0}</b> is <b>{1} KB</b>. Do you really want to load it?</p></source> <translation><p>O tamanho do ficheiro <b>{0}</b> é <b>{1} KB</b>. Tem a certeza de que o quer carregar?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="400"/> + <location filename="../QScintilla/Editor.py" line="403"/> <source><b>A Source Editor Window</b><p>This window is used to display and edit a source file. You can open as many of these as you like. The name of the file is displayed in the window's titlebar.</p><p>In order to set breakpoints just click in the space between the line numbers and the fold markers. Via the context menu of the margins they may be edited.</p><p>In order to set bookmarks just Shift click in the space between the line numbers and the fold markers.</p><p>These actions can be reversed via the context menu.</p><p>Ctrl clicking on a syntax error marker shows some info about this error.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="658"/> - <source>Undo</source> - <translation>Desfazer</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="661"/> - <source>Redo</source> - <translation>Refazer</translation> + <source>Undo</source> + <translation>Desfazer</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="664"/> + <source>Redo</source> + <translation>Refazer</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="667"/> <source>Revert to last saved state</source> <translation>Voltar ao último estado guardado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="668"/> - <source>Cut</source> - <translation>Cortar</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="671"/> - <source>Copy</source> - <translation>Copiar</translation> + <source>Cut</source> + <translation>Cortar</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="674"/> + <source>Copy</source> + <translation>Copiar</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="677"/> <source>Paste</source> <translation>Colar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="679"/> - <source>Indent</source> - <translation>Indentar</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="682"/> - <source>Unindent</source> - <translation>Tirar Indentação</translation> + <source>Indent</source> + <translation>Indentar</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="685"/> - <source>Comment</source> - <translation>Comentar</translation> + <source>Unindent</source> + <translation>Tirar Indentação</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="688"/> - <source>Uncomment</source> - <translation>Descomentar</translation> + <source>Comment</source> + <translation>Comentar</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="691"/> - <source>Stream Comment</source> - <translation type="unfinished"></translation> + <source>Uncomment</source> + <translation>Descomentar</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="694"/> + <source>Stream Comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="697"/> <source>Box Comment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="698"/> - <source>Select to brace</source> - <translation>Selecionar até parentesis</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="700"/> - <source>Select all</source> - <translation>Selecionar tudo</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="701"/> + <source>Select to brace</source> + <translation>Selecionar até parentesis</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="703"/> + <source>Select all</source> + <translation>Selecionar tudo</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="704"/> <source>Deselect all</source> <translation>Desselecionar tudo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7242"/> + <location filename="../QScintilla/Editor.py" line="7249"/> <source>Check spelling...</source> <translation>Verificação ortográfica...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="707"/> + <location filename="../QScintilla/Editor.py" line="710"/> <source>Check spelling of selection...</source> <translation>Verificação ortográfica da seleção...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="711"/> + <location filename="../QScintilla/Editor.py" line="714"/> <source>Remove from dictionary</source> <translation>Retirar do dicionário</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="715"/> + <location filename="../QScintilla/Editor.py" line="718"/> <source>Shorten empty lines</source> <translation>Encolher linhas vazias</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="722"/> + <location filename="../QScintilla/Editor.py" line="725"/> <source>Use Monospaced Font</source> <translation>Usar Tipo de Letra de Tamanho Único</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="727"/> + <location filename="../QScintilla/Editor.py" line="730"/> <source>Autosave enabled</source> <translation>Ativado autogravar </translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="731"/> + <location filename="../QScintilla/Editor.py" line="734"/> <source>Typing aids enabled</source> <translation>Habilitada a ajuda à escritura</translation> </message> @@ -9516,27 +9516,27 @@ <translation type="obsolete">Autocompletar Habilitado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="768"/> + <location filename="../QScintilla/Editor.py" line="771"/> <source>Close</source> <translation>Fechar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="774"/> - <source>Save</source> - <translation>Gravar</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="777"/> + <source>Save</source> + <translation>Gravar</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="780"/> <source>Save As...</source> <translation>Gravar Como...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="790"/> - <source>Print Preview</source> - <translation>Antevisão da Impressão</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="793"/> + <source>Print Preview</source> + <translation>Antevisão da Impressão</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="796"/> <source>Print</source> <translation>Imprimir</translation> </message> @@ -9551,742 +9551,742 @@ <translation type="obsolete">dinâmico</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="819"/> + <location filename="../QScintilla/Editor.py" line="822"/> <source>Complete from Document</source> <translation type="unfinished">desde Documento</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="821"/> + <location filename="../QScintilla/Editor.py" line="824"/> <source>Complete from APIs</source> <translation type="unfinished">desde APIs</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="823"/> + <location filename="../QScintilla/Editor.py" line="826"/> <source>Complete from Document and APIs</source> <translation type="unfinished">desde Documento e APIs</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="746"/> + <location filename="../QScintilla/Editor.py" line="749"/> <source>Calltip</source> <translation>Dica</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="837"/> + <location filename="../QScintilla/Editor.py" line="840"/> <source>Check</source> <translation>Verificar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="857"/> - <source>Show</source> - <translation>Mostrar</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="859"/> - <source>Code metrics...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="860"/> - <source>Code coverage...</source> - <translation type="unfinished"></translation> + <source>Show</source> + <translation>Mostrar</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="862"/> - <source>Show code coverage annotations</source> + <source>Code metrics...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="863"/> + <source>Code coverage...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="865"/> - <source>Hide code coverage annotations</source> + <source>Show code coverage annotations</source> <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Editor.py" line="868"/> + <source>Hide code coverage annotations</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="871"/> <source>Profile data...</source> <translation>Dados de Perfil...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="881"/> + <location filename="../QScintilla/Editor.py" line="884"/> <source>Diagrams</source> <translation>Diagramas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="883"/> + <location filename="../QScintilla/Editor.py" line="886"/> <source>Class Diagram...</source> <translation>Diagrama de Classes...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="885"/> + <location filename="../QScintilla/Editor.py" line="888"/> <source>Package Diagram...</source> <translation>Diagrama do Pacote...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="887"/> + <location filename="../QScintilla/Editor.py" line="890"/> <source>Imports Diagram...</source> <translation>Diagrama de Imports...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="889"/> + <location filename="../QScintilla/Editor.py" line="892"/> <source>Application Diagram...</source> <translation>Diagrama da Aplicação...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="907"/> - <source>Languages</source> - <translation>Linguagens</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="910"/> + <source>Languages</source> + <translation>Linguagens</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="913"/> <source>No Language</source> <translation>Nenhuma Linguagem</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="933"/> + <location filename="../QScintilla/Editor.py" line="936"/> <source>Guessed</source> <translation>Adivinhado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1268"/> + <location filename="../QScintilla/Editor.py" line="1271"/> <source>Alternatives</source> <translation>Alternativas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="953"/> + <location filename="../QScintilla/Editor.py" line="956"/> <source>Encodings</source> <translation>Codificações</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="994"/> + <location filename="../QScintilla/Editor.py" line="997"/> <source>End-of-Line Type</source> <translation>Tipo do Fim-de-Linha</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="998"/> + <location filename="../QScintilla/Editor.py" line="1001"/> <source>Unix</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1005"/> + <location filename="../QScintilla/Editor.py" line="1008"/> <source>Windows</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1012"/> + <location filename="../QScintilla/Editor.py" line="1015"/> <source>Macintosh</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1030"/> + <location filename="../QScintilla/Editor.py" line="1033"/> <source>Export as</source> <translation>Exportar como</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1153"/> + <location filename="../QScintilla/Editor.py" line="1156"/> <source>Toggle bookmark</source> <translation>Alternar marcadores</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1155"/> + <location filename="../QScintilla/Editor.py" line="1158"/> <source>Next bookmark</source> <translation>Marcador seguinte</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1157"/> + <location filename="../QScintilla/Editor.py" line="1160"/> <source>Previous bookmark</source> <translation>Marcador anterior</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1159"/> + <location filename="../QScintilla/Editor.py" line="1162"/> <source>Clear all bookmarks</source> <translation>Limpar os marcadores todos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1179"/> + <location filename="../QScintilla/Editor.py" line="1182"/> <source>Toggle breakpoint</source> <translation>Alternar pontos de interrupção</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1181"/> - <source>Toggle temporary breakpoint</source> - <translation>Alternar pontos de interrupção temporais</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1184"/> + <source>Toggle temporary breakpoint</source> + <translation>Alternar pontos de interrupção temporais</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1187"/> <source>Edit breakpoint...</source> <translation>Editar ponto de interrupção...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5154"/> + <location filename="../QScintilla/Editor.py" line="5161"/> <source>Enable breakpoint</source> <translation>Habilitar pontos de interrupção</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1189"/> + <location filename="../QScintilla/Editor.py" line="1192"/> <source>Next breakpoint</source> <translation>Ponto de interrupção seguinte</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1191"/> + <location filename="../QScintilla/Editor.py" line="1194"/> <source>Previous breakpoint</source> <translation>Ponto de interrupção anterior</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1193"/> + <location filename="../QScintilla/Editor.py" line="1196"/> <source>Clear all breakpoints</source> <translation>Apagar todos os pontos de interrupção</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1162"/> + <location filename="../QScintilla/Editor.py" line="1165"/> <source>Goto syntax error</source> <translation>Ir ao erro de sintaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1164"/> + <location filename="../QScintilla/Editor.py" line="1167"/> <source>Show syntax error message</source> <translation>Mostrar a mensagem de erro de sintaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1166"/> - <source>Clear syntax error</source> - <translation>Limpar o erro de sintaxe</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1169"/> - <source>Next warning</source> - <translation>Aviso seguinte</translation> + <source>Clear syntax error</source> + <translation>Limpar o erro de sintaxe</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="1172"/> + <source>Next warning</source> + <translation>Aviso seguinte</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1175"/> <source>Previous warning</source> <translation>Aviso anterior</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1174"/> + <location filename="../QScintilla/Editor.py" line="1177"/> <source>Show warning message</source> <translation>Mostrar mensagem de aviso</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1176"/> + <location filename="../QScintilla/Editor.py" line="1179"/> <source>Clear warnings</source> <translation>Limpar avisos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1196"/> - <source>Next uncovered line</source> - <translation>Linha seguinte sem cobrir</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1199"/> - <source>Previous uncovered line</source> - <translation>Linha anterior sem cobrir</translation> + <source>Next uncovered line</source> + <translation>Linha seguinte sem cobrir</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="1202"/> + <source>Previous uncovered line</source> + <translation>Linha anterior sem cobrir</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1205"/> <source>Next task</source> <translation>Tarefa seguinte</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1204"/> + <location filename="../QScintilla/Editor.py" line="1207"/> <source>Previous task</source> <translation>Tarefa anterior</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1213"/> + <location filename="../QScintilla/Editor.py" line="1216"/> <source>LMB toggles bookmarks</source> <translation>Botão Esq. do Rato alterna marcadores</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1217"/> + <location filename="../QScintilla/Editor.py" line="1220"/> <source>LMB toggles breakpoints</source> <translation>Botão Esq. do Rato alterna pontos de interrupção</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1253"/> + <location filename="../QScintilla/Editor.py" line="1256"/> <source>Export source</source> <translation>Exportar fonte</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1245"/> + <location filename="../QScintilla/Editor.py" line="1248"/> <source><p>No exporter available for the export format <b>{0}</b>. Aborting...</p></source> <translation><p>Não está disponível um exportador para formato <b>{0}</b>. A cancelar...</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1253"/> + <location filename="../QScintilla/Editor.py" line="1256"/> <source>No export format given. Aborting...</source> <translation>Não foi dado o formato para exportar. A cancelar...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1264"/> + <location filename="../QScintilla/Editor.py" line="1267"/> <source>Alternatives ({0})</source> <translation>Alternativas ({0})</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1284"/> + <location filename="../QScintilla/Editor.py" line="1287"/> <source>Pygments Lexer</source> <translation>Analizador Léxico Pygments</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1284"/> + <location filename="../QScintilla/Editor.py" line="1287"/> <source>Select the Pygments lexer to apply.</source> <translation>Selecionar o analizador léxico Pygments a aplicar.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1752"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>Modification of Read Only file</source> <translation>Modificação do ficheiro de Apenas Leitura</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1752"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Tenta alterar um ficheiro de Apenas Leitura. Por favor guarde-o primeiro num ficheiro diferente. </translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2443"/> + <location filename="../QScintilla/Editor.py" line="2448"/> <source>Printing...</source> <translation>A imprimir...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2460"/> - <source>Printing completed</source> - <translation>Impressão completa</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2462"/> - <source>Error while printing</source> - <translation>Erro durante a impressão</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2465"/> + <source>Printing completed</source> + <translation>Impressão completa</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2467"/> + <source>Error while printing</source> + <translation>Erro durante a impressão</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2470"/> <source>Printing aborted</source> <translation>Impressão cancelada</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2823"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source>File Modified</source> <translation>Ficheiro Modificado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2823"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>O ficheiro <b>{0}</b> tem alterações por gravar.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2878"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>Não se pôde abrir o ficheiro <b>{0}</b>.</p><p> Motivo: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3041"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source>Save File</source> <translation>Gravar Ficheiro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2982"/> + <location filename="../QScintilla/Editor.py" line="2987"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>O ficheiro <b>{0}</b> não se pôde gravar. <br/>Motivo: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3041"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>O ficheiro <b>{0}</b> já existe. Sobreescrever?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4427"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion</source> <translation>Autocompletar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4427"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Autocompletar não está disponivel porque a fonte de autocompletar não está definida.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5157"/> + <location filename="../QScintilla/Editor.py" line="5164"/> <source>Disable breakpoint</source> <translation>Inabilitar ponto de interrupção</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5531"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Code Coverage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5531"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Please select a coverage file</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../QScintilla/Editor.py" line="5601"/> + <source>Show Code Coverage Annotations</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../QScintilla/Editor.py" line="5594"/> - <source>Show Code Coverage Annotations</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5587"/> <source>All lines have been covered.</source> <translation>Foram cobertas as linhas todas.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5594"/> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>There is no coverage file available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5709"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Profile Data</source> <translation>Dados de Perfil</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5709"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Please select a profile file</source> <translation>Escolha um ficheiro de perfil por favor</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5869"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>Syntax Error</source> <translation>Erro de Sintaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5869"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>No syntax error message available.</source> <translation>Não está disponível a mensagem de erro de sintaxe.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6184"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Macro Name</source> <translation>Nome de Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6184"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Select a macro name:</source> <translation>Selecionar um nome de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6212"/> + <location filename="../QScintilla/Editor.py" line="6219"/> <source>Load macro file</source> <translation>Carregar ficheiro macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6255"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Macro files (*.macro)</source> <translation>Ficheiros Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6235"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source>Error loading macro</source> <translation>Erro ao carregar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6226"/> + <location filename="../QScintilla/Editor.py" line="6233"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>O ficheiro macro <b>{0}</b> não se pode ler.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6235"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>O ficheiro macro <b>{0}</b> está corrompido.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6255"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Save macro file</source> <translation>Gravar ficheiro macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6272"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source>Save macro</source> <translation>Gravar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6272"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>O ficheiro macro <b>{0}</b> já existe. Sobreescrever-lo?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6288"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source>Error saving macro</source> <translation>Erro ao gravar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6288"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>O ficheiro macro <b>{0}</b> não pode ser escrito.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6301"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Start Macro Recording</source> <translation>Iniciar Registo de Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6301"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Macro recording is already active. Start new?</source> <translation>A gravação de macro já está ativada. Começar nova?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6327"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Macro Recording</source> <translation>Gravação de Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6327"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Enter name of the macro:</source> <translation>Introduza o nome de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6465"/> + <location filename="../QScintilla/Editor.py" line="6472"/> <source>File changed</source> <translation>Ficheiro alterado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6629"/> + <location filename="../QScintilla/Editor.py" line="6636"/> <source>{0} (ro)</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6769"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6769"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> não é um ficheiro.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6790"/> + <location filename="../QScintilla/Editor.py" line="6797"/> <source>Resources</source> <translation>Recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6792"/> - <source>Add file...</source> - <translation>Adicionar Ficheiro...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6794"/> - <source>Add files...</source> - <translation>Adicionar Ficheiros...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6796"/> - <source>Add aliased file...</source> - <translation>Adicionar ficheiro com pseudónimo...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6799"/> - <source>Add localized resource...</source> - <translation>Adicionar recursos localizado...</translation> + <source>Add file...</source> + <translation>Adicionar Ficheiro...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6801"/> + <source>Add files...</source> + <translation>Adicionar Ficheiros...</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="6803"/> + <source>Add aliased file...</source> + <translation>Adicionar ficheiro com pseudónimo...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6806"/> + <source>Add localized resource...</source> + <translation>Adicionar recursos localizado...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6810"/> <source>Add resource frame</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6822"/> + <location filename="../QScintilla/Editor.py" line="6829"/> <source>Add file resource</source> <translation>Adicionar recurso de ficheiro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6838"/> + <location filename="../QScintilla/Editor.py" line="6845"/> <source>Add file resources</source> <translation>Adicionar recursos de ficheiro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6866"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Add aliased file resource</source> <translation>Adicionar recurso de ficheiro com pseudónimo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6866"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Alias for file <b>{0}</b>:</source> <translation>Pseudónimo para o ficheiro <b>{0}</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6930"/> + <location filename="../QScintilla/Editor.py" line="6937"/> <source>Package Diagram</source> <translation>Diagrama do Pacote</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6930"/> + <location filename="../QScintilla/Editor.py" line="6937"/> <source>Include class attributes?</source> <translation>Incluir atributos de classes?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6950"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Imports Diagram</source> <translation>Diagrama de Imports</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6950"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Include imports from external modules?</source> <translation>Incluir imports de módulos externos?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6964"/> + <location filename="../QScintilla/Editor.py" line="6971"/> <source>Application Diagram</source> <translation>Diagrama da Aplicação</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6964"/> + <location filename="../QScintilla/Editor.py" line="6971"/> <source>Include module names?</source> <translation>Incluir nome dos módulos?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7245"/> + <location filename="../QScintilla/Editor.py" line="7252"/> <source>Add to dictionary</source> <translation>Adicionar dicionário</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7247"/> + <location filename="../QScintilla/Editor.py" line="7254"/> <source>Ignore All</source> <translation>Ignorar Tudo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6123"/> - <source>Warning: {0}</source> - <translation>Aviso: {0}</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6130"/> + <source>Warning: {0}</source> + <translation>Aviso: {0}</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6137"/> <source>Error: {0}</source> <translation>Erro: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6461"/> + <location filename="../QScintilla/Editor.py" line="6468"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Aviso:</b> Perderá todas as alterações uma vez que o volte a abrir.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4532"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Activating Auto-Completion Provider</source> <translation>A ativar o Fornecedor de Preenchimento Automático</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4532"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>Não se pode conetar o fornecedor de autocompletar porque já há outro ativo. Por favor verifique a sua configuração.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4852"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Activating Calltip Provider</source> <translation>A ativar Fornecedor de Dicas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4852"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>O fornecedor de dicas não pode ser conetado porque já há outro activado. Por favor verifique a sua configuração.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="786"/> + <location filename="../QScintilla/Editor.py" line="789"/> <source>Open 'rejection' file</source> <translation>Abrir ficheiro de 'rejeição'</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="893"/> + <location filename="../QScintilla/Editor.py" line="896"/> <source>Load Diagram...</source> <translation>Carregar Diagrama...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1207"/> - <source>Next change</source> - <translation>Alteração seguinte</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1210"/> + <source>Next change</source> + <translation>Alteração seguinte</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1213"/> <source>Previous change</source> <translation>Alteração anterior</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7659"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>Sort Lines</source> <translation>Ordenar Linhas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7659"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>A seleção contém dados ilegais para uma ordenação numérica.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6059"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6059"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>No warning messages available.</source> <translation>Não estão disponíveis mensagens de aviso.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6120"/> + <location filename="../QScintilla/Editor.py" line="6127"/> <source>Style: {0}</source> <translation>Estilo: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="760"/> - <source>New Document View</source> - <translation>Vista de Documento Novo</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="763"/> + <source>New Document View</source> + <translation>Vista de Documento Novo</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="766"/> <source>New Document View (with new split)</source> <translation>Vista de Documento Novo (com divisão nova)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="847"/> + <location filename="../QScintilla/Editor.py" line="850"/> <source>Tools</source> <translation>Ferramentas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="975"/> + <location filename="../QScintilla/Editor.py" line="978"/> <source>Re-Open With Encoding</source> <translation>Reabrir Com Codificação</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6455"/> + <location filename="../QScintilla/Editor.py" line="6462"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation><p>O ficheiro <b>{0}</b> foi alterado enquanto estava aberto em eric6. Recarregar?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="738"/> + <location filename="../QScintilla/Editor.py" line="741"/> <source>Automatic Completion enabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="816"/> + <location filename="../QScintilla/Editor.py" line="819"/> <source>Complete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4581"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4581"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7746"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7746"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="780"/> + <location filename="../QScintilla/Editor.py" line="783"/> <source>Save Copy...</source> <translation type="unfinished"></translation> </message> @@ -10364,7 +10364,7 @@ <translation>Pressionar para selecionar um ficheiro API da lista de ficheiros API instalados</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> <source>Add from installed APIs</source> <translation>Adicionar desde APIs instalados</translation> </message> @@ -10374,7 +10374,7 @@ <translation>Pressionar para selecionar um ficheiro API da lista de ficheiros API instalados pelos complementos</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> <source>Add from Plugin APIs</source> <translation>Adicionar desde APIs de Complementos</translation> </message> @@ -10384,7 +10384,7 @@ <translation>Pressionar para compilar a definição de APIs selecionada</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="299"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="301"/> <source>Compile APIs</source> <translation>Compilar APIs</translation> </message> @@ -10399,22 +10399,22 @@ <translation>Ficheiro API (*.api);;Ficheiros Todos (*)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="238"/> <source>Select from the list of installed API files</source> <translation>Escolher da lista de ficheiros API instalados</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> <source>Select from the list of API files installed by plugins</source> <translation>Escolher da lista de ficheiros API instalados por complementos</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="314"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="316"/> <source>Cancel compilation</source> <translation>Cancelar compilação</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> <source>There are no APIs installed yet. Selection is not available.</source> <translation>Ainda não há APIs instalados. A escolha não está disponível.</translation> </message> @@ -10586,6 +10586,89 @@ </message> </context> <context> + <name>EditorButtonsWidget</name> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="175"/> + <source>Bold</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="177"/> + <source>Italic</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="179"/> + <source>Strike Through</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="182"/> + <source>Header 1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="184"/> + <source>Header 2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="186"/> + <source>Header 3</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="188"/> + <source>Header</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="193"/> + <source>Inline Code</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="195"/> + <source>Code Block</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="197"/> + <source>Quote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="200"/> + <source>Add Hyperlink</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="202"/> + <source>Add Horizontal Line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="204"/> + <source>Add Image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="207"/> + <source>Add Bulleted List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="209"/> + <source>Add Numbered List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="273"/> + <source>Level {0}</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>EditorCalltipsPage</name> <message> <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="17"/> @@ -11395,7 +11478,7 @@ <translation>Selecionar o analizador léxico alternativo</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightersPage.py" line="142"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightersPage.py" line="146"/> <source>Alternative</source> <translation>Alternativa</translation> </message> @@ -11458,7 +11541,7 @@ <translation>Selecionar preenchimento até ao fim de linha.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> <source>Fill to end of line</source> <translation>Preencher até fim de linha</translation> </message> @@ -11568,42 +11651,42 @@ <translation>Apenas Tamanho</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="351"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="355"/> <source>Enabled</source> <translation>Habilitado</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="352"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="356"/> <source>Disabled</source> <translation>Inabilitado</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> <source>Select fill to end of line for all styles</source> <translation>Selecionar encher até ao fim de linha para todos os estilos</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465"/> <source>Export Highlighting Styles</source> <translation>Exportar Estilos de Realce</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="477"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="481"/> <source>Highlighting styles file (*.e4h)</source> <translation>Ficheiro estilos de realce (*.e4h)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465"/> <source><p>The highlighting styles could not be exported to file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Os estilos de realce não se poderam exportar ao ficheiro <b>{0}</b>.</p><p>Motivo: {1}</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="497"/> <source>Import Highlighting Styles</source> <translation>Importar Estilos de Realce</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="497"/> <source><p>The highlighting styles could not be read from file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Os estilos de realce não se poderam ler do ficheiro <b>{0}</b>.</p><p>Motivo: {1}</p></translation> </message> @@ -11715,12 +11798,12 @@ <translation>Propriedades do Léxico de Bash</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1048"/> <source>Select whether folding of comments shall be possible</source> <translation>Selecionar se a dobragem de comentários deve ser possível</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1051"/> <source>Fold comments</source> <translation>Dobrar comentários</translation> </message> @@ -11730,22 +11813,22 @@ <translation>Propriedades do Léxico de C++ , IDL, Java e JavaScript</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="990"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/> <source>Select whether folding at else statement should be possible</source> <translation>Selecionar se a dobragem em instruções else devem ser possíveis</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/> <source>Fold at else</source> <translation>Dobrar em else</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="522"/> <source>Select whether folding of preprocessor directives shall be possible</source> <translation>Selecionar se a dobragem de directivas do preprocessador deve ser possível</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="525"/> <source>Fold preprocessor directives</source> <translation>Dobrar diretivas de preprocessamento</translation> </message> @@ -11855,187 +11938,187 @@ <translation>Scripts de Estilo</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/> <source>Pascal Lexer Properties</source> <translation>Propriedades do Léxico de Pascal</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="503"/> - <source>Select to enable smart highlighting of keywords</source> - <translation>Selecionar para habilitar realce inteligente de palavras chave</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/> - <source>Smart Highlighting</source> - <translation>Realce Inteligente</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="516"/> - <source>Perl Lexer Properties</source> - <translation>Propriedades do Léxico de Perl</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/> - <source>Select to enable folding of Perl packages</source> - <translation>Selecionar para habilitar dobragem de pacotes Perl</translation> + <source>Select to enable smart highlighting of keywords</source> + <translation>Selecionar para habilitar realce inteligente de palavras chave</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="535"/> - <source>Fold packages</source> - <translation>Dobrar pacotes</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="542"/> - <source>Select to enable folding of Perl POD blocks</source> - <translation>Selecionar para habilitar dobragem de blocos POD de Perl</translation> + <source>Smart Highlighting</source> + <translation>Realce Inteligente</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/> + <source>Perl Lexer Properties</source> + <translation>Propriedades do Léxico de Perl</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="561"/> + <source>Select to enable folding of Perl packages</source> + <translation>Selecionar para habilitar dobragem de pacotes Perl</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="564"/> + <source>Fold packages</source> + <translation>Dobrar pacotes</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="571"/> + <source>Select to enable folding of Perl POD blocks</source> + <translation>Selecionar para habilitar dobragem de blocos POD de Perl</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="574"/> <source>Fold POD blocks</source> <translation>Dobrar blocos POD</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="565"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="594"/> <source>PostScript Lexer Properties</source> <translation>Propriedades do Léxico de PostScript</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="581"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="610"/> <source>Select to mark tokens</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="584"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="613"/> <source>Mark Tokens</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="593"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="622"/> <source>PostScript Level:</source> <translation>Nível de PostScript:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="600"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="629"/> <source>Select the PostScript level</source> <translation>Selecionar o nível de PostScript</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="637"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/> <source>Povray Lexer Properties</source> <translation>Propriedades do Léxico de Povray</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="643"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/> <source>Select whether folding of directives shall be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="646"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/> <source>Fold directives</source> <translation>Dobrar diretivas</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="685"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> <source>Python Lexer Properties</source> <translation>Propriedades do Léxico de Python</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="796"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="825"/> <source>Select whether bad indentation shall be highlighted</source> <translation>Selecionar se a indentação errada deve ser realçada</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="730"/> <source>Select whether folding of strings shall be possible</source> <translation>Selecionar se a dobragem de strings deve ser possível</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="733"/> <source>Fold strings</source> <translation>Dobrar strings</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="721"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="750"/> <source>Select whether text should be autoindented after a ':'</source> <translation>Selecionar se o texto deve auto indentar-se depois de ':'</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="724"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="753"/> <source>Auto indentation after ':'</source> <translation>Indentação automática após ':'</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="741"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="770"/> <source>Select to allow Python v2 unicode string literals (e.g. u"utf8")</source> <translation>Selecionar para permitir literais de string unicódigo (ex: u"utf8")</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="744"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="773"/> <source>Allow v2 unicode string literals</source> <translation>Permitir literais de string unicódigo v2</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="751"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="780"/> <source>Select to allow Python v3 binary and octal literals (e.g. 0b1011, 0o712)</source> <translation>Selecionar para permitir literais binários e octais de Python v3 (ex: 0b1011, 0o712)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="754"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/> <source>Allow v3 binary and octal literals</source> <translation>Permitir literais de binários e octais v3</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="761"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="790"/> <source>Select to allow Python v3 bytes string literals (e.g. b"bytes")</source> <translation>Selecionar para permitir literais de strings de bytes Python v3 (ex: b"bytes")</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="764"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="793"/> <source>Allow v3 bytes string literals</source> <translation>Permitir literais de strings de bytes</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="827"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/> <source>SQL Lexer Properties</source> <translation>Propriedades do Léxico de SQL</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="863"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="892"/> <source>Select to enable Backslash Escapes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="866"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="895"/> <source>Backslash Escapes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="964"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/> <source>VHDL Lexer Properties</source> <translation>Propriedades do Léxico de VHDL</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="999"/> <source>Select whether folding of blocks at a parenthesis shall be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1002"/> <source>Fold at parenthesis</source> <translation>Dobrar nos parentesis</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1009"/> <source>Select whether folding of begin blocks shall be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1012"/> <source>Fold at begin</source> <translation>Dobrar em begin</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1013"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1042"/> <source>YAML Lexer Properties</source> <translation>Propriedades do Léxico de YAML</translation> </message> @@ -12070,112 +12153,112 @@ <translation>Permitir modelos de Mako</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="695"/> <source>Properties Lexer Properties</source> <translation>Propriedades do Léxico de Propriedades</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/> <source>Select to allow initial spaces in a line</source> <translation>Selecionar para permitir espaços no inicio de uma linha</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/> <source>Allow initial spaces</source> <translation>Permitir espaços iniciais</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="740"/> <source>Select whether folding of triple quoted strings shall be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="743"/> <source>Fold triple quoted strings</source> <translation>Dobrar strings entre aspas triples</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="760"/> <source>Select to allow strings to span newline characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="734"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="763"/> <source>Strings may span newline characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="808"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="837"/> <source>Ruby Lexer Properties</source> <translation>Propriedades do Léxico de Ruby</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="853"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="882"/> <source>Select whether only BEGIN blocks can be folded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="885"/> <source>Only BEGIN blocks can be folded</source> <translation>Apenas blocos BEGIN podem ser dobrados</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="873"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="902"/> <source>Select if words may contain dots</source> <translation>Selecionar se as palavras podem conter pontos</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="876"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="905"/> <source>Words may contain dots</source> <translation>Palavras podem conter pontos</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="883"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="912"/> <source>Select to allow '#' as a comment character</source> <translation>Selecionar para permitir '#' como caracter de comentario</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="886"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="915"/> <source>Allow '#' as comment character</source> <translation>Permitir '#' como caracter de comentario</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="893"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="922"/> <source>Select to enable quoted identifiers</source> <translation>Selecionar para habilitar identificadores entre aspas</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="896"/> - <source>Enable quoted identifiers</source> - <translation>Permitir identificadores entre aspas</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="906"/> - <source>TCL Lexer Properties</source> - <translation>Propriedades do Léxico de TCL</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="925"/> - <source>TeX Lexer Properties</source> - <translation>Propriedades do Léxico de TeX</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="941"/> - <source>Select to treat comments as TeX source</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="944"/> - <source>Treat comments as TeX source</source> - <translation>Tratas comentários como fonte TeX</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="951"/> - <source>Select to treat \if<unknown> as a command</source> - <translation>Selecionar para tratar \if<unknown> como comando</translation> + <source>Enable quoted identifiers</source> + <translation>Permitir identificadores entre aspas</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="935"/> + <source>TCL Lexer Properties</source> + <translation>Propriedades do Léxico de TCL</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="954"/> + <source>TeX Lexer Properties</source> + <translation>Propriedades do Léxico de TeX</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/> + <source>Select to treat comments as TeX source</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/> + <source>Treat comments as TeX source</source> + <translation>Tratas comentários como fonte TeX</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/> + <source>Select to treat \if<unknown> as a command</source> + <translation>Selecionar para tratar \if<unknown> como comando</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/> <source>Treat \if<unknown> as command</source> <translation>Tratar \if<unknown> como comando</translation> </message> @@ -12185,7 +12268,7 @@ <translation>Realçar aspas triples</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="774"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="803"/> <source>Highlight sub-identifiers</source> <translation>Realçar sub-identificadores</translation> </message> @@ -12195,7 +12278,7 @@ <translation>Selecionar para realçar as strings entre aspas triples</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="771"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="800"/> <source>Select to highlight sub-identifiers defined in keyword set 2</source> <translation type="unfinished"></translation> </message> @@ -12250,32 +12333,32 @@ <translation>Propriedades do Léxico de Gettext</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="812"/> <source>Highlight bad indentation:</source> <translation>Realçar indentação má:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>No Warning</source> <translation>Sem Aviso</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Inconsistent</source> <translation>Inconsistente</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Tabs after Spaces</source> <translation>Tabulações após Espaços</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Spaces</source> <translation>Espaços</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Tabs</source> <translation>Tabulações</translation> </message> @@ -12295,7 +12378,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="194"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/> <source>Highlight escape sequences</source> <translation type="unfinished"></translation> </message> @@ -12309,6 +12392,26 @@ <source>Allow verbatim string escape sequences</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/> + <source>JSON</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="483"/> + <source>Select to enable highlighting of line/block comments</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="486"/> + <source>Highlight comments</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/> + <source>Select to enable highlighting of escape sequences in strings</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSearchPage</name> @@ -13453,6 +13556,16 @@ <source>Select the colour for the search marker</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1866"/> + <source>Select to hide the Format Buttons bar when formatting is not supported</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1869"/> + <source>Hide Format Buttons bar when not supported</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSyntaxPage</name> @@ -13718,7 +13831,7 @@ <context> <name>EmailDialog</name> <message> - <location filename="../UI/EmailDialog.py" line="339"/> + <location filename="../UI/EmailDialog.py" line="346"/> <source>Send bug report</source> <translation>Enviar relatório de falho</translation> </message> @@ -13813,27 +13926,27 @@ <translation>Tem a certeza de que quer fechar a caixa de diálogo?</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="293"/> + <location filename="../UI/EmailDialog.py" line="300"/> <source>Mail Server Password</source> <translation>Senha do Servidor de Correio</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="293"/> + <location filename="../UI/EmailDialog.py" line="300"/> <source>Enter your mail server password</source> <translation>Introduzir a senha do seu servidor de correio</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="311"/> + <location filename="../UI/EmailDialog.py" line="318"/> <source><p>Authentication failed.<br>Reason: {0}</p></source> <translation><p>Falho na autenticação. <br>Razão: {0}</p></translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="339"/> + <location filename="../UI/EmailDialog.py" line="346"/> <source><p>Message could not be sent.<br>Reason: {0}</p></source> <translation><p>Não se pôde enviar a mensagem. <br>Razão: {0}</p></translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="357"/> + <location filename="../UI/EmailDialog.py" line="364"/> <source>Attach file</source> <translation>Anexar ficheiro</translation> </message> @@ -13858,98 +13971,133 @@ <message> <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/> <source>Outgoing mail server port:</source> - <translation>Porto do servidor de correio de saída:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="60"/> + <translation type="obsolete">Porto do servidor de correio de saída:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="124"/> <source>Enter the port of the mail server</source> <translation>Introduza o porto do servidor de correio</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="92"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/> <source>Email address:</source> <translation>Direção do correio eletrónico:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="99"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/> <source>Enter your email address</source> <translation>Introduzir o direção do seu correio eletrónico</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="106"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="170"/> <source>Signature:</source> <translation>Assinatura:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="116"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="180"/> <source>Enter your email signature</source> <translation>Introduzir a assinatura do seu correio eletrónico</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="128"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="104"/> <source>Select to use TLS</source> <translation>Selecionar para usar TLS</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="131"/> <source>Use TLS</source> - <translation>Usar TLS</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="138"/> + <translation type="obsolete">Usar TLS</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="192"/> <source>Select to authenticatate against the mail server</source> <translation>Selecionar para autenticar contra o servidor de correio</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="141"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="195"/> <source>Mail server needs authentication</source> <translation>Servidor de correio necessita autenticação</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="153"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="204"/> <source>Username:</source> <translation>Nome de Usuário:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="211"/> <source>Enter your mail server username</source> <translation>Introduzir nome de usuário no seu servidor de correio</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="173"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="218"/> <source>Password:</source> <translation>Senha:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="183"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="225"/> <source>Enter your password for accessing the mail server</source> <translation>Introduzir a sua senha para aceder ao servidor de correio</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="193"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="235"/> <source>Press to test the login data</source> <translation>Pressionar para provar os dados de conexão</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="196"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="238"/> <source>Test Login</source> <translation>Provar Conexão</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/> <source>Login Test</source> <translation>Prova de Conexão</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="138"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="204"/> <source>The login test succeeded.</source> <translation>A prova de conexão teve êxito.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/> <source><p>The login test failed.<br>Reason: {0}</p></source> <translation><p>A prova de conexão falhou.<br>Motivo: {0}</p></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/> + <source>Encryption Method:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="81"/> + <source>Select to use no encryption</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="84"/> + <source>None</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="94"/> + <source>Select to use SSL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="97"/> + <source>SSL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="107"/> + <source>TLS</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="117"/> + <source>Port:</source> + <translation type="unfinished">Porto:</translation> + </message> </context> <context> <name>EricAccessHandler</name> @@ -14901,12 +15049,12 @@ <context> <name>ExceptionsFilterDialog</name> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="13"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="14"/> <source>Exceptions Filter</source> <translation>Filtro de Exceções</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="16"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="17"/> <source><b>Exception Filter</b> <p>This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the "Start Debugging" dialog is unchecked, no exception will be reported at all.</p> <p>Please note, that unhandled exceptions are always highlighted independent of these settings.</p></source> @@ -14915,42 +15063,42 @@ <p>Por favor note-se que as exceções sem tratar sempre serão ressaltadas, independentemente das definições.</p></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="27"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="28"/> <source>List of exceptions that shall be highlighted</source> <translation>Lista de exceções que deverão ser ressaltadas</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="42"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="41"/> <source>Press to add the entered exception to the list</source> <translation>Pressionar para adicionar à lista a exceção introduzida</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="45"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="44"/> <source>Add</source> <translation>Adicionar</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="52"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="51"/> <source>Enter an exception type that shall be highlighted</source> <translation>Introduzir um tipo de exceção que deva ser ressaltada</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="66"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="61"/> <source>Press to delete the selected exception from the list</source> <translation>Pressionar para apagar a exceção marcada da lista</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="69"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="64"/> <source>Delete</source> <translation>Apagar</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="76"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="71"/> <source>Press to delete all exceptions from the list</source> <translation>Pressionar para apagar todas as exceções da lista</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="79"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="74"/> <source>Delete All</source> <translation>Apagar Tudo</translation> </message> @@ -22089,7 +22237,7 @@ <translation type="obsolete">O processo hg terminou com o código de saída {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1822"/> <source>The hg process did not finish within 30s.</source> <translation>O processo hg não acabou em 30s.</translation> </message> @@ -22144,147 +22292,147 @@ <translation>A renomear {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012"/> <source>Reverting changes</source> <translation>Desfazer alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1057"/> <source>Merging</source> <translation>A mesclar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1359"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> <source>Copying {0}</source> <translation>A copiar {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/> <source>Pulling from a remote Mercurial repository</source> <translation>A puxar dum repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2022"/> <source>Pushing to a remote Mercurial repository</source> <translation>A empurrar a um repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230"/> <source>Creating branch in the Mercurial repository</source> <translation>A criar ramo no repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259"/> <source>Showing current branch</source> <translation>A mostrar o ramo atual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>A verificar a integridade do repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403"/> <source>Showing the combined configuration settings</source> <translation>A mostrar as definições de configuração combinadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2427"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2451"/> <source>Recovering from interrupted transaction</source> <translation>A recuperar duma transação interrompida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2475"/> <source>Identifying project directory</source> <translation>A identificar o diretorio do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source>Create .hgignore file</source> <translation>Criar ficheiro .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>O ficheiro <b>{0}</b> já existe. Sobreescrever?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2604"/> <source>Create changegroup</source> <translation>Criar conjunto de alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2623"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2578"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2625"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2710"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2730"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> <source>Shall the working directory be updated?</source> <translation>O diretorio de trabalho deve ser atualizado?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2727"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2759"/> <source>Removing files from the Mercurial repository only</source> <translation>A retirar ficheiros apenas do repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793"/> <source>No revision given. Aborting...</source> <translation>Não foi dada revisão. Terminando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -22294,72 +22442,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2959"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> <source>Change Phase</source> <translation>Mudar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source>Remove Sub-repositories</source> <translation>Retirar Sub Repositórios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -22374,157 +22522,157 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Revert changes</source> <translation>Desfazer alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1030"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="997"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> <source>Mercurial Side-by-Side Difference</source> <translation>Diferenças lado a lado de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>O ficheiro <b>{0}</b> não se pôde ler.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> <source>Re-Merge</source> <translation>Remesclar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1133"/> <source>Current branch tip</source> <translation>Dica de ramo atual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/> <source>Marking as 'unresolved'</source> <translation>A marcar como 'sem resolver'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> <source>Marking as 'resolved'</source> <translation>A marcar como 'resolvido'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Created new branch <{0}>.</source> <translation>Criado o novo ramo <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3614"/> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> <source>Delete Bookmark</source> <translation>Apagar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> <source>Select the bookmark to be deleted:</source> <translation>Selecionar o marcador a apagar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/> <source>Delete Mercurial Bookmark</source> <translation>Apagar o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/> <source>Rename Mercurial Bookmark</source> <translation>Renomear o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> <source>Move Mercurial Bookmark</source> <translation>Mover o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Pull Bookmark</source> <translation>Puxar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Select the bookmark to be pulled:</source> <translation>Selecionar o marcador a puxar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>A puxar marcador desde o repositório remoto de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Push Bookmark</source> <translation>Empurrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Select the bookmark to be push:</source> <translation>Selecione o marcador a empurrar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3924"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>A empurrar marcador a um repositório remoto de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -24894,7 +25042,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>Mercurial Log</source> <translation>Registo de Mercurial</translation> </message> @@ -24934,17 +25082,17 @@ <translation>Selecionar o campo a filtrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/> <source>Revision</source> <translation>Revisão</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="103"/> <source>Message</source> <translation>Mensagem</translation> </message> @@ -24969,192 +25117,192 @@ <translation>Etiquetas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="285"/> <source>Action</source> <translation>Ação</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="290"/> <source>Path</source> <translation>Rota</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="295"/> <source>Copy from</source> <translation>Copiar de</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="306"/> <source>Press to get the next bunch of log entries</source> <translation>Pressionar para obter a próxima cambada de entradas no registo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="309"/> <source>&Next</source> <translation>Segui&nte</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="316"/> <source>Enter the limit of entries to fetch</source> <translation>Introduzir o limite de entradas a recuperar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="335"/> <source>Select to stop listing log messages at a copy or move</source> <translation>Selecionar para parar de listar mensagens de registo ao copiar ou mover</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="338"/> <source>Stop on Copy/Move</source> <translation>Parar em Copiar/Mover</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="378"/> <source>Press to generate a diff to the first parent revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="381"/> <source>Diff to Parent &1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> <source>Press to generate a diff to the second parent revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="391"/> <source>Diff to Parent &2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="398"/> <source>Press to compare two revisions</source> <translation>Pressionar para comparar duas revisões</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="401"/> <source>&Compare Revisions</source> <translation>&Comparar Revisões</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="462"/> <source>Errors</source> <translation>Erros</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="468"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Registo de erros de Mercurial</b><p>Mostra as mensagens possiveis do comando hg log.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="484"/> <source>Input</source> <translation>Entrada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="474"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="506"/> <source>Press to send the input to the hg process</source> <translation>Pressionar para enviar a entrada ao processo hg</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="477"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="509"/> <source>&Send</source> <translation>&Enviar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="512"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="519"/> <source>Enter data to be sent to the hg process</source> <translation>Introduzir dados a enviar ao processo hg</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="526"/> <source>Select to switch the input field to password mode</source> <translation>Selecionar para mudar o campo de entrada ao modo senha</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="529"/> <source>&Password Mode</source> <translation>Modo &Senha</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="532"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> <source>Added</source> <translation>Adicionado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169"/> <source>Deleted</source> <translation>Apagado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source>Modified</source> <translation>Alterado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="147"/> <source>All</source> <translation>Tudo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="666"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="747"/> <source>The hg process did not finish within 30s.</source> <translation>O processo hg não acabou em 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="669"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="750"/> <source>Could not start the hg executable.</source> <translation>Não se pôde iniciar o executável hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="753"/> <source>Mercurial Error</source> <translation>Erro de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="993"/> <source>Process Generation Error</source> <translation>Erro na Criação de Processo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="993"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> <source>Mercurial Log (Incoming)</source> <translation>Registo de Mercurial (Entrante)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="77"/> <source>Mercurial Log (Outgoing)</source> <translation>Registo de Mercurial (Sainte)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> <source>Bookmarks</source> <translation>Marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="90"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> <source>&Refresh</source> <translation>Atualiza&r</translation> </message> @@ -25164,84 +25312,84 @@ <translation>Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> <source>Change the phase of the selected revisions</source> <translation>Alterar a fase das revisões selecionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="227"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation><b>Mudar Fase</b> <p>Muda a fase das revisões selecionadas. As revisões selecionadas devem ter a mesma fase atual.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> <source>Change Phase</source> <translation>Mudar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1899"/> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2091"/> <source>The project should be reread. Do this now?</source> <translation>O projecto deve ser recarregado. Fazer-lo agora?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="444"/> <source>Select to show differences side-by-side</source> <translation>Selecionar para mostrar as diferenças lado-a-lado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> <source>Show differences side-by-side</source> <translation>Mostrar diferenças lado-a-lado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="421"/> <source>Select action from menu</source> <translation>Selecionar ação do menu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> - <source>Tag</source> - <translation>Etiquetar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="204"/> - <source>Tag the selected revision</source> - <translation>Etiqueta a revisão selecionada</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1773"/> - <source>Switch</source> - <translation type="unfinished">Mudar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="209"/> - <source>Switch the working directory to the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/> + <source>Tag</source> + <translation>Etiquetar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="235"/> + <source>Tag the selected revision</source> + <translation>Etiqueta a revisão selecionada</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1951"/> + <source>Switch</source> + <translation type="unfinished">Mudar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="240"/> + <source>Switch the working directory to the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/> <source>Pull Large Files</source> <translation>Puxar Ficheiros Grandes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="265"/> <source>Pull large files for selected revisions</source> <translation>Puxar os ficheiros grandes das revisões selecionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="983"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1087"/> <source>{0} (large file)</source> <translation>{0} (ficheiro grande)</translation> </message> @@ -25266,352 +25414,372 @@ <translation>Pressionar para encontrar a ocurrência seguinte</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Find</source> <translation>Encontrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Filter</source> <translation>Filtro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/> <source>File</source> <translation>Ficheiro</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></source> - <translation><table><tr><td><b>Revisão</b></td><td>{0}</td></tr><tr><td><b>Data</b></td><td>{1}</td></tr><tr><td><b>Autor</b></td><td>{2}</td></tr><tr><td><b>Ramo</b></td><td>{3}</td></tr><tr><td><b>Pais</b></td><td>{4}</td></tr>{5}</table></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <translation type="obsolete"><table><tr><td><b>Revisão</b></td><td>{0}</td></tr><tr><td><b>Data</b></td><td>{1}</td></tr><tr><td><b>Autor</b></td><td>{2}</td></tr><tr><td><b>Ramo</b></td><td>{3}</td></tr><tr><td><b>Pais</b></td><td>{4}</td></tr>{5}</table></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiquetas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2192"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2192"/> <source>'{0}' was not found.</source> <translation>'{0}' não foi encontrado.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174"/> <source>Draft</source> <translation type="unfinished">Rascunho</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> <source>Public</source> <translation type="unfinished">Público</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/> <source>Secret</source> <translation type="unfinished">Secreto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2049"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="261"/> <source>Pull changes from a remote repository</source> <translation type="unfinished">Puxar alterações do repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="274"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1852"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2030"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2091"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> <source>Fetch changes from a remote repository</source> <translation type="unfinished">Trazer alterações de um repositório remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="291"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="245"/> <source>Define Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="248"/> <source>Bookmark the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250"/> <source>Move Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253"/> <source>Move bookmark to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1972"/> <source>Define Bookmark</source> <translation type="unfinished">Definir Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1972"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1816"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1994"/> <source>Move Bookmark</source> <translation type="unfinished">Mover marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1816"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1994"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1937"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr><tr><td><b>Children</b></td><td>{5}</td></tr>{6}</table></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="368"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> + <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="14"/> <source>Mercurial Log</source> - <translation>Registo de Mercurial</translation> + <translation type="obsolete">Registo de Mercurial</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="26"/> <source>Log</source> - <translation>Registo</translation> + <translation type="obsolete">Registo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="32"/> <source><b>Mercurial Log</b><p>This shows the output of the hg log command. By clicking on the links you may show the difference between revisions.</p></source> - <translation><b>Registo de Mercurial</b><p>Mostra a saída do comando hg log. Clicando nos vínculos pode mostrar a diferença entre as revisões.</p></translation> + <translation type="obsolete"><b>Registo de Mercurial</b><p>Mostra a saída do comando hg log. Clicando nos vínculos pode mostrar a diferença entre as revisões.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="61"/> <source>Errors</source> - <translation>Erros</translation> + <translation type="obsolete">Erros</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="67"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> - <translation><b>Erros de Mercurial log</b><p>Mostra as possiveis mensagens de erro do comando hg log.</p></translation> + <translation type="obsolete"><b>Erros de Mercurial log</b><p>Mostra as possiveis mensagens de erro do comando hg log.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="83"/> <source>Input</source> - <translation>Entrada</translation> + <translation type="obsolete">Entrada</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="105"/> <source>Press to send the input to the hg process</source> - <translation>Pressionar para enviar a entrada ao processo hg</translation> + <translation type="obsolete">Pressionar para enviar a entrada ao processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="108"/> <source>&Send</source> - <translation>&Enviar</translation> + <translation type="obsolete">&Enviar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="111"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="118"/> <source>Enter data to be sent to the hg process</source> - <translation>Introduzir dados a enviar ao processo hg</translation> + <translation type="obsolete">Introduzir dados a enviar ao processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="125"/> <source>Select to switch the input field to password mode</source> - <translation>Selecionar para mudar o campo de entrada ao modo senha</translation> + <translation type="obsolete">Selecionar para mudar o campo de entrada ao modo senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="128"/> <source>&Password Mode</source> - <translation>Modo &Senha</translation> + <translation type="obsolete">Modo &Senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="131"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="64"/> <source><b>Processing your request, please wait...</b></source> - <translation><b>A processar a sua solicitude, por favor espere...</b></translation> + <translation type="obsolete"><b>A processar a sua solicitude, por favor espere...</b></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="74"/> <source>Revision</source> - <translation>Revisão</translation> + <translation type="obsolete">Revisão</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> <source>Process Generation Error</source> - <translation>Erro na Criação de Processo</translation> + <translation type="obsolete">Erro na Criação de Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation>Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> + <translation type="obsolete">Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="270"/> <source>The hg process did not finish within 30s.</source> - <translation>O processo hg não acabou em 30s.</translation> + <translation type="obsolete">O processo hg não acabou em 30s.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> <source>Could not start the hg executable.</source> - <translation>Não se pôde iniciar o executável hg.</translation> + <translation type="obsolete">Não se pôde iniciar o executável hg.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="276"/> <source>Mercurial Error</source> - <translation>Erro de Mercurial</translation> + <translation type="obsolete">Erro de Mercurial</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/> <source>No log available for '{0}'</source> - <translation>Sem registos disponiveis para '{0}'</translation> + <translation type="obsolete">Sem registos disponiveis para '{0}'</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="344"/> <source>diff to {0}</source> - <translation>diff a {0}</translation> + <translation type="obsolete">diff a {0}</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="358"/> <source>Tags: {0}<br /> </source> - <translation>Etiquetas: {0}<br /> + <translation type="obsolete">Etiquetas: {0}<br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="364"/> <source>Parents: {0}<br /> </source> - <translation>Pais: {0}<br /></translation> + <translation type="obsolete">Pais: {0}<br /></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="367"/> <source><i>Author: {0}</i><br /> </source> - <translation><i>Autor: {0}</i><br /> + <translation type="obsolete"><i>Autor: {0}</i><br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="371"/> <source><i>Date: {0}, {1}</i><br /> </source> - <translation><i>Data: {0}, {1}</i><br /> + <translation type="obsolete"><i>Data: {0}, {1}</i><br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="382"/> <source>Added {0} (copied from {1})<br /> </source> - <translation>Adicionado {0} (copiado de {1})<br /> + <translation type="obsolete">Adicionado {0} (copiado de {1})<br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="387"/> <source>Added {0}<br /> </source> - <translation>Adicionado {0}<br /> + <translation type="obsolete">Adicionado {0}<br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="393"/> <source>Modified {0}<br /> </source> - <translation>Modificado {0}<br /> + <translation type="obsolete">Modificado {0}<br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="399"/> <source>Deleted {0}<br /> </source> - <translation>Apagado {0}<br /> + <translation type="obsolete">Apagado {0}<br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="361"/> <source>Bookmarks: {0}<br /> </source> - <translation>Marcadores: {0}<br /> + <translation type="obsolete">Marcadores: {0}<br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="352"/> <source>Phase: {0}<br /> </source> - <translation>Fase: {0}<br /> + <translation type="obsolete">Fase: {0}<br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="45"/> <source>Select to show differences side-by-side</source> - <translation>Selecionar para mostrar as diferenças lado-a-lado</translation> + <translation type="obsolete">Selecionar para mostrar as diferenças lado-a-lado</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="48"/> <source>Show differences side-by-side</source> - <translation>Mostrar diferenças lado-a-lado</translation> + <translation type="obsolete">Mostrar diferenças lado-a-lado</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="355"/> <source>Branch: {0}<br /> </source> - <translation>Ramo: {0}<br /></translation> + <translation type="obsolete">Ramo: {0}<br /></translation> </message> </context> <context> @@ -25986,107 +26154,107 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="605"/> <source>Version Control</source> <translation>Control de Versão</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="617"/> <source>Commit changes to repository...</source> <translation>Cometer alterações no repositório...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> <source>Add to repository</source> <translation>Adicionar ao repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628"/> <source>Remove from repository (and disk)</source> <translation>Retirar do repositorio (e disco)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Remove from repository only</source> <translation>Retirar apenas do repositorio</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="548"/> <source>Show log</source> - <translation>Mostrar registo</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="552"/> + <translation type="obsolete">Mostrar registo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="544"/> <source>Show log browser</source> <translation>Mostrar navegador de registos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> <source>Show status</source> <translation>Mostrar estado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="343"/> <source>Show annotated file</source> <translation>Mostrar ficheiro anotado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Revert changes</source> <translation>Desfazer alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="663"/> <source>Select all local file entries</source> <translation>Selecionar todas as entradas de ficheiros locais</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="665"/> <source>Select all versioned file entries</source> <translation>Selecionar todas as entradas de ficheiros versionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> <source>Select all local directory entries</source> <translation>Selecionar todas as entradas de diretorios locais</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="669"/> <source>Select all versioned directory entries</source> <translation>Selecionar todas as entradas de diretorios versionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Do you really want to remove these files from the repository?</source> <translation>Tem a certeza de que quer retirar estes ficheiros do repositorio?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="539"/> <source>Copy</source> <translation>Copiar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="541"/> <source>Move</source> <translation>Mover</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="639"/> <source>Show differences</source> <translation>Mostrar diferenças</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="329"/> <source>Show differences side-by-side</source> <translation>Mostrar diferenças lado-a-lado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="651"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="643"/> <source>Show differences (extended)</source> <translation>Mostrar diferenças (extendido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="338"/> <source>Show differences side-by-side (extended)</source> <translation>Selecionar para mostrar as diferenças lado-a-lado (extendido)</translation> </message> @@ -26096,22 +26264,22 @@ <translation>Extensões</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="653"/> <source>Conflicts resolved</source> <translation>Conflitos resolvidos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="656"/> <source>Conflicts unresolved</source> <translation>Conflitos sem resolver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659"/> <source>Re-Merge</source> <translation>Remesclar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="672"/> <source>Configure...</source> <translation>Configurar...</translation> </message> @@ -26275,1266 +26443,1246 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> - <source>Show log</source> - <translation>Mostrar registo</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> - <source>Show &log</source> - <translation>Mostrar re&gisto</translation> + <source>Show log browser</source> + <translation>Mostrar navegador de registos</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> - <source>Show the log of the local project</source> - <translation>Mostra o registo do projeto local</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> - <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> - <source>Show log browser</source> - <translation>Mostrar navegador de registos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> - <source>Show a dialog to browse the log of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show &difference</source> <translation>Mostrar &diferenças</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> <source>Show status</source> <translation>Mostrar estado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> <source>Show the status of the local project</source> <translation type="unfinished">Mostrar estado do projeto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> <source>Show heads</source> <translation>Mostrar cabeçalhos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Show the heads of the repository</source> <translation>Mostrar os cabeçalhos do repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357"/> <source>Show parents</source> <translation>Mostrar pais</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Show the parents of the repository</source> <translation>Mostrar os pais do repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="371"/> <source>Show tip</source> <translation>Mostrar dica</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <source>Show the tip of the repository</source> + <translation>Mostrar a dica do repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> + <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <source>Revert changes</source> + <translation>Desfazer alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <source>Re&vert changes</source> + <translation>&Desfazer alterações</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> - <source>Show the tip of the repository</source> - <translation>Mostrar a dica do repositorio</translation> + <source>Revert all changes made to the local project</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> - <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> - <source>Revert changes</source> - <translation>Desfazer alterações</translation> + <source>Merge</source> + <translation>Mesclar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> - <source>Re&vert changes</source> - <translation>&Desfazer alterações</translation> + <source>Mer&ge changes...</source> + <translation>&Mesclar alterações...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> - <source>Revert all changes made to the local project</source> + <source>Merge changes of a revision into the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> - <source>Merge</source> - <translation>Mesclar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> - <source>Mer&ge changes...</source> - <translation>&Mesclar alterações...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> - <source>Merge changes of a revision into the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <source>Tag in repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <source>&Tag in repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <source>Tag the local project in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> - <source>Tag in repository</source> + <source>List tags</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> - <source>&Tag in repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> - <source>Tag the local project in the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> - <source>List tags</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>List branches</source> <translation>Listar ramos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>List branches...</source> <translation>Listar ramos...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> + <source>List branches of the project</source> + <translation>Listar os ramos do projeto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Listar ramos</b><p>Lista os ramos do projeto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create branch</source> + <translation>Criar ramo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create &branch...</source> + <translation>Criar &ramo...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> - <source>List branches of the project</source> - <translation>Listar os ramos do projeto</translation> + <source>Create a new branch for the local project in the repository</source> + <translation>Criar um ramo novo para o projeto local no repositorio</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Listar ramos</b><p>Lista os ramos do projeto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Create branch</source> - <translation>Criar ramo</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Create &branch...</source> - <translation>Criar &ramo...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> - <source>Create a new branch for the local project in the repository</source> - <translation>Criar um ramo novo para o projeto local no repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Criar ramo</b><p>Cria um ramo novo para o projeto local no repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> <source>Close branch</source> <translation>Fechar ramo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> <source>Close the current branch of the local project</source> <translation>Fechar o ramo atual no projeto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Fechar ramo</b><p>Fecha o ramo atual do projeto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> <source>Show current branch</source> <translation>Mostrar ramo atual</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Show the current branch of the project</source> + <translation>Mostrar o ramo atual do projeto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation><b>Mostrar ramo atual</b><p>Mostra o ramo atual do projeto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <source>Switch</source> + <translation>Mudar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <source>S&witch...</source> + <translation>M&udar...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> - <source>Show the current branch of the project</source> - <translation>Mostrar o ramo atual do projeto</translation> + <source>Switch the working directory to another revision</source> + <translation>Mudar o diretorio de trabalho a outra revisão</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation><b>Mostrar ramo atual</b><p>Mostra o ramo atual do projeto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> - <source>Switch</source> - <translation>Mudar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> - <source>S&witch...</source> - <translation>M&udar...</translation> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation><b>Mudar</b><p>Muda o diretorio de trabalho a outra revisão.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Cleanup</source> + <translation>Limpar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Cleanu&p</source> + <translation>Lim&par</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Switch the working directory to another revision</source> - <translation>Mudar o diretorio de trabalho a outra revisão</translation> + <source>Cleanup the local project</source> + <translation>Limpar o projeto local</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> - <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> - <translation><b>Mudar</b><p>Muda o diretorio de trabalho a outra revisão.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source>Cleanup</source> - <translation>Limpar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source>Cleanu&p</source> - <translation>Lim&par</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> - <source>Cleanup the local project</source> - <translation>Limpar o projeto local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Limpar</b><p>Realiza uma limpeza ao projeto local.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <source>Execute command</source> + <translation>Executar comando</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <source>E&xecute command...</source> + <translation>E&xecutar comando...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <source>Execute an arbitrary Mercurial command</source> + <translation>Executa um comando de Mercurial arbitrário</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> + <translation><b>Executar comando</b><p>Abre uma caixa de diálogo para introduzir um comando Mercurial arbitrário.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>Execute command</source> - <translation>Executar comando</translation> + <source>Configure</source> + <translation>Configurar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>E&xecute command...</source> - <translation>E&xecutar comando...</translation> + <source>Configure...</source> + <translation>Configurar...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> - <source>Execute an arbitrary Mercurial command</source> - <translation>Executa um comando de Mercurial arbitrário</translation> + <source>Show the configuration dialog with the Mercurial page selected</source> + <translation>Mostrar a caixa de diálogo de configuração com a página de Mercurial selecionada</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> - <translation><b>Executar comando</b><p>Abre uma caixa de diálogo para introduzir um comando Mercurial arbitrário.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Configure</source> - <translation>Configurar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Configure...</source> - <translation>Configurar...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> - <source>Show the configuration dialog with the Mercurial page selected</source> - <translation>Mostrar a caixa de diálogo de configuração com a página de Mercurial selecionada</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Configurar</b><p>Mostra a caixa de diálogo de configuração com a página de Mercurial selecionada.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths</source> <translation>Mostrar rotas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths...</source> <translation>Mostrar rotas...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository</source> <translation>Verificar repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository...</source> <translation>Verificar repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> <source>Verify the integrity of the repository</source> <translation>Verificar a integridade do repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Verificar repositorio</b><p>Verifica a integridade do repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover</source> <translation>Recuperar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover...</source> <translation>Recuperar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> <source>Recover from an interrupted transaction</source> <translation>Recuperar duma transação interrompida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Recuperar</b><p>Recupera de uma transação interrompida.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify</source> <translation>Identificar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify...</source> <translation>Identificar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> <source>Identify the project directory</source> <translation>Identificar o diretorio do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identificar</b><p>Identifica o diretorio do projeto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> <source>Create .hgignore</source> <translation>Criar .hgignore</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup</source> + <translation type="unfinished">Criar conjunto de alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> - <source>Create a .hgignore file with default values</source> + <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> - <source>Create changegroup</source> - <translation type="unfinished">Criar conjunto de alterações</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> - <source>Create changegroup...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> - <source>Create changegroup file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1793"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <source>Mark as "good"</source> + <translation>Marcar como "bom"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <source>Mark as "good"...</source> + <translation>Marcar como "bom"...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> - <source>Apply one or several changegroup files</source> + <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> - <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source>Mark as "good"</source> - <translation>Marcar como "bom"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source>Mark as "good"...</source> - <translation>Marcar como "bom"...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source>Mark as "bad"</source> <translation>Marcar como "mau"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source>Mark as "bad"...</source> <translation>Marcar como "mau"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <source>Skip</source> <translation>Saltar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> <source>Reset</source> <translation>Restablecer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> + <source>Serve the project repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/> + <source><b>Serve project repository</b><p>This serves the project repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1300"/> + <source>Specials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> + <source>Bisect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1610"/> + <source>Pull</source> + <translation>Puxar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <source>The project should be reread. Do this now?</source> + <translation>O projecto deve ser recarregado. Fazer-lo agora?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> + <source>Push new branch</source> + <translation>Empurrar ramo novo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> + <source>Push the current branch of the local project as a new named branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> + <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> + <source>Rollback last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <source>Rollback the last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> + <source>Extensions</source> + <translation>Extensões</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <source>Edit user configuration</source> + <translation>Editar configuração de usuário</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <source>Edit user configuration...</source> + <translation>Editar configuração de usuário...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> + <source>Show an editor to edit the user configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <source>Show an editor to edit the repository configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> + <source>Show the combined configuration settings from all configuration files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> + <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> + <source>Skip...</source> + <translation>Saltar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> + <source>Skip a selectable changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <source><b>Skip</b><p>This skips a selectable changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1849"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> - <source>Serve the project repository</source> + <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> - <source><b>Serve project repository</b><p>This serves the project repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1315"/> - <source>Specials</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1324"/> - <source>Changegroup Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> - <source>Bisect</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1627"/> - <source>Pull</source> - <translation>Puxar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/> - <source>The project should be reread. Do this now?</source> - <translation>O projecto deve ser recarregado. Fazer-lo agora?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> - <source>Push new branch</source> - <translation>Empurrar ramo novo</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> - <source>Push the current branch of the local project as a new named branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> - <source>Rollback last transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> - <source>Rollback the last transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> - <source>Extensions</source> - <translation>Extensões</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source>Edit user configuration</source> - <translation>Editar configuração de usuário</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source>Edit user configuration...</source> - <translation>Editar configuração de usuário...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> - <source>Show an editor to edit the user configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Edit repository configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> - <source>Show an editor to edit the repository configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> - <source>Show the combined configuration settings from all configuration files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> - <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> - <source>Skip...</source> - <translation>Saltar...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> - <source>Skip a selectable changeset</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> - <source><b>Skip</b><p>This skips a selectable changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1866"/> - <source>Import Patch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> - <source>Import Patch...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> - <source>Import a patch from a patch file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1316"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1869"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Export Patches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <source>Export revisions to patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> - <source>Export Patches</source> - <translation type="unfinished"></translation> + <source>Change Phase</source> + <translation type="unfinished">Mudar Fase</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> - <source>Export Patches...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> - <source>Change Phase</source> - <translation type="unfinished">Mudar Fase</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1889"/> + <source>Copy Changesets</source> + <translation type="unfinished">Copiar Conjuntos de Alterações</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> - <source>Change the phase of revisions</source> + <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> - <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1906"/> - <source>Copy Changesets</source> - <translation type="unfinished">Copiar Conjuntos de Alterações</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Conflicts resolved</source> + <translation type="unfinished">Conflitos resolvidos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1393"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/> - <source>Copy Changesets (Continue)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Conflicts resolved</source> - <translation type="unfinished">Conflitos resolvidos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <source>Add</source> + <translation>Adicionar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <source>Add...</source> + <translation>Adicionar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <source>Add a sub-repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Add</source> - <translation>Adicionar</translation> + <source>Remove</source> + <translation>Retirar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Add...</source> - <translation>Adicionar...</translation> + <source>Remove...</source> + <translation>Retirar...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> - <source>Add a sub-repository</source> - <translation type="unfinished"></translation> + <source>Remove sub-repositories</source> + <translation>Retirar sub repositorios</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> - <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> - <source>Remove</source> - <translation>Retirar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> - <source>Remove...</source> - <translation>Retirar...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> - <source>Remove sub-repositories</source> - <translation>Retirar sub repositorios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation><b>Retirar...</b><p>Retira sub repositorios do projeto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> <source>Sub-Repository</source> <translation></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> + <source>Show &status...</source> + <translation>Mostrar e&stado...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <source>Show Summary</source> + <translation>Mostrar Sumário</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> - <source>Show &status...</source> - <translation>Mostrar e&stado...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> - <source>Show Summary</source> - <translation>Mostrar Sumário</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show summary...</source> <translation>Mostrar sumário...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> <source>Show summary information of the working directory status</source> <translation>Mostrar informação sumária do estado do diretorio de trabalho</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation><b>Mostrar sumário</b><p>Mostra alguma informação sumária do estado do diretorio de trabalho.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show differences</source> <translation>Mostrar diferenças</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> <source>Show differences (extended)</source> <translation>Mostrar diferenças (extendido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> + <source>Cancel uncommitted merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> + <source>Cancel an uncommitted merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> + <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>Cancel uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> - <source>Cancel an uncommitted merge and lose all changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/> - <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>Re-Merge</source> <translation>Remesclar</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <source>Re-Merge all conflicting, unresolved files of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> + <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts</source> + <translation>Mostrar conflitos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts...</source> + <translation>Mostrar conflitos...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> - <source>Re-Merge all conflicting, unresolved files of the project</source> + <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> - <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Show conflicts</source> - <translation>Mostrar conflitos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Show conflicts...</source> - <translation>Mostrar conflitos...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> - <source>Show a dialog listing all files with conflicts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Conflicts unresolved</source> <translation>Conflitos sem resolver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <source>List bookmarks</source> + <translation>Listar marcadores</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <source>List bookmarks...</source> + <translation>Listar marcadores...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <source>List bookmarks of the project</source> + <translation>Listar marcadores do projeto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation><b>Listar marcadores</b><p>Lista os marcadores do projeto.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>List bookmarks</source> - <translation>Listar marcadores</translation> + <source>Define bookmark</source> + <translation>Definir marcador</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>List bookmarks...</source> - <translation>Listar marcadores...</translation> + <source>Define bookmark...</source> + <translation>Definir marcador...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> - <source>List bookmarks of the project</source> - <translation>Listar marcadores do projeto</translation> + <source>Define a bookmark for the project</source> + <translation>Definir um marcador para o projeto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation><b>Listar marcadores</b><p>Lista os marcadores do projeto.</p></translation> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <translation><b>Definir marcador</b><p>Define um marcador para o projeto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Define bookmark</source> - <translation>Definir marcador</translation> + <source>Delete bookmark</source> + <translation>Apagar marcador</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Define bookmark...</source> - <translation>Definir marcador...</translation> + <source>Delete bookmark...</source> + <translation>Apagar Marcador...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> - <source>Define a bookmark for the project</source> - <translation>Definir um marcador para o projeto</translation> + <source>Delete a bookmark of the project</source> + <translation>Apagar um marcador do projeto </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation><b>Definir marcador</b><p>Define um marcador para o projeto.</p></translation> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation><b>Apagar marcador</b><p>Apaga um marcador do projeto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Delete bookmark</source> - <translation>Apagar marcador</translation> + <source>Rename bookmark</source> + <translation>Renomear marcador</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Delete bookmark...</source> - <translation>Apagar Marcador...</translation> + <source>Rename bookmark...</source> + <translation>Renomear marcador...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <source>Delete a bookmark of the project</source> - <translation>Apagar um marcador do projeto </translation> + <source>Rename a bookmark of the project</source> + <translation>Renomear um marcador do projeto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation><b>Apagar marcador</b><p>Apaga um marcador do projeto.</p></translation> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation><b>Renomear marcador</b><p>Renomeia um marcador do projeto</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Rename bookmark</source> - <translation>Renomear marcador</translation> + <source>Move bookmark</source> + <translation>Mover marcador</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Rename bookmark...</source> - <translation>Renomear marcador...</translation> + <source>Move bookmark...</source> + <translation>Mover marcador...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> - <source>Rename a bookmark of the project</source> - <translation>Renomear um marcador do projeto</translation> + <source>Move a bookmark of the project</source> + <translation>Mover um marcador do projeto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation><b>Renomear marcador</b><p>Renomeia um marcador do projeto</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source>Move bookmark</source> - <translation>Mover marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source>Move bookmark...</source> - <translation>Mover marcador...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> - <source>Move a bookmark of the project</source> - <translation>Mover um marcador do projeto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1144"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> <source>Show incoming bookmarks</source> <translation>Mostrar marcadores entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Show a list of incoming bookmarks</source> <translation>Mostrar uma lista de marcadores entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation><b>Mostrar marcadores entrantes</b><p>Mostra uma lista de marcadores novos disponíveis no repositório remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Pull bookmark</source> <translation>Puxar marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> <source>Pull a bookmark from a remote repository</source> <translation>Puxa um marcador desde um repositório remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Puxar marcador</b><p>Puxa (pull) um marcador desde um repositório remoto para o repositório local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> <source>Show outgoing bookmarks</source> <translation>Mostrar marcadores saintes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> <source>Show a list of outgoing bookmarks</source> <translation>Mostrar a lista de marcadores saintes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation><b>Mostrar marcadores saintes</b><p>Mostra a lista dos marcadores novos disponíveis no repositório local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/> <source>Push bookmark</source> <translation>Empurrar marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> <source>Push a bookmark to a remote repository</source> <translation>Empurrar um marcador a um repositório remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Empurrar marcador</b><p>Empurra (push) um marcador do repositório local para o repositório remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/> <source>Administration</source> <translation>Administração</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> <source>Tags</source> <translation type="unfinished">Etiquetas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> <source>Branches</source> <translation>Ramos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> <source>Bookmarks</source> <translation>Marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> <source>Manage Changes</source> <translation>Gerir Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> @@ -30732,6 +30880,42 @@ </message> </context> <context> + <name>HtmlProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/HtmlProvider.py" line="388"/> + <source>Create List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HtmlProvider.py" line="388"/> + <source>Enter desired number of list elements:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HyperlinkMarkupDialog</name> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="14"/> + <source>Insert Hyperlink</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="23"/> + <source>Link Text:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="33"/> + <source>Link Target:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="43"/> + <source>Link Title:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>IExplorerImporter</name> <message> <location filename="../WebBrowser/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="40"/> @@ -30933,1061 +31117,1086 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="128"/> + <location filename="../IconEditor/IconEditorWindow.py" line="130"/> <source>Graphic Interchange Format File (*.gif)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="129"/> - <source>Windows Icon File (*.ico)</source> - <translation>Ficheiro Icones de Windows (*.ico)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="130"/> - <source>JPEG File (*.jpg)</source> - <translation>Ficheiro JPEG (*.jpg)</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="132"/> - <source>Multiple-Image Network Graphics File (*.mng)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="133"/> - <source>Portable Bitmap File (*.pbm)</source> - <translation type="unfinished"></translation> + <source>Windows Icon File (*.ico)</source> + <translation>Ficheiro Icones de Windows (*.ico)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="134"/> - <source>Paintbrush Bitmap File (*.pcx)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="135"/> - <source>Portable Graymap File (*.pgm)</source> - <translation type="unfinished"></translation> + <source>JPEG File (*.jpg)</source> + <translation>Ficheiro JPEG (*.jpg)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="136"/> - <source>Portable Network Graphics File (*.png)</source> + <source>Multiple-Image Network Graphics File (*.mng)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="137"/> - <source>Portable Pixmap File (*.ppm)</source> + <source>Portable Bitmap File (*.pbm)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="138"/> - <source>Silicon Graphics Image File (*.sgi)</source> + <source>Paintbrush Bitmap File (*.pcx)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="139"/> - <source>Scalable Vector Graphics File (*.svg)</source> - <translation>Ficheiro de Gráficos de Vectores Escaláveis (*.svg)</translation> + <source>Portable Graymap File (*.pgm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="140"/> + <source>Portable Network Graphics File (*.png)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="141"/> + <source>Portable Pixmap File (*.ppm)</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="142"/> - <source>Targa Graphic File (*.tga)</source> + <source>Silicon Graphics Image File (*.sgi)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="143"/> - <source>TIFF File (*.tif)</source> - <translation type="unfinished"></translation> + <source>Scalable Vector Graphics File (*.svg)</source> + <translation>Ficheiro de Gráficos de Vectores Escaláveis (*.svg)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="146"/> - <source>X11 Bitmap File (*.xbm)</source> - <translation>Ficheiro Bitmap X11 (*.xbm)</translation> + <source>Targa Graphic File (*.tga)</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="147"/> + <source>TIFF File (*.tif)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="151"/> + <source>X11 Bitmap File (*.xbm)</source> + <translation>Ficheiro Bitmap X11 (*.xbm)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="152"/> <source>X11 Pixmap File (*.xpm)</source> <translation>Ficheiro Pixmap X11 (*.xpm)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="158"/> + <location filename="../IconEditor/IconEditorWindow.py" line="163"/> <source>All Files (*)</source> <translation>Ficheiros Todos (*)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>New</source> <translation>Novo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>&New</source> <translation>&Novo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>Ctrl+N</source> <comment>File|New</comment> <translation>Ctrl+N</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="196"/> + <location filename="../IconEditor/IconEditorWindow.py" line="201"/> <source>Create a new icon</source> <translation>Criar um icone novo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="197"/> + <location filename="../IconEditor/IconEditorWindow.py" line="202"/> <source><b>New</b><p>This creates a new icon.</p></source> <translation><b>Novo</b><p>Cria um icone novo.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="204"/> + <location filename="../IconEditor/IconEditorWindow.py" line="209"/> <source>New Window</source> <translation>Nova Janela</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="204"/> - <source>New &Window</source> - <translation>Nova &Janela</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="209"/> + <source>New &Window</source> + <translation>Nova &Janela</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="214"/> <source>Open a new icon editor window</source> <translation>Abrir uma nova janela do editor de ícones</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="211"/> + <location filename="../IconEditor/IconEditorWindow.py" line="216"/> <source><b>New Window</b><p>This opens a new icon editor window.</p></source> <translation><b>Nova Janela</b><p>Abre uma janela nova do editor de ícones.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>Open</source> <translation>Abrir</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>&Open...</source> <translation>&Abrir...</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>Ctrl+O</source> <comment>File|Open</comment> <translation>Ctrl+O</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="224"/> + <location filename="../IconEditor/IconEditorWindow.py" line="229"/> <source>Open an icon file for editing</source> <translation>Abrir um ficheiro de ícones para editar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="225"/> + <location filename="../IconEditor/IconEditorWindow.py" line="230"/> <source><b>Open File</b><p>This opens a new icon file for editing. It pops up a file selection dialog.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>Save</source> <translation>Gravar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>&Save</source> <translation>&Gravar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>Ctrl+S</source> <comment>File|Save</comment> <translation>Ctrl+S</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="239"/> + <location filename="../IconEditor/IconEditorWindow.py" line="244"/> <source>Save the current icon</source> <translation>Gravar o ícone atual</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="240"/> + <location filename="../IconEditor/IconEditorWindow.py" line="245"/> <source><b>Save File</b><p>Save the contents of the icon editor window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Save As</source> <translation>Gravar Como</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Save &As...</source> <translation>Gr&avar Como...</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Shift+Ctrl+S</source> <comment>File|Save As</comment> <translation>Shift+Ctrl+S</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="253"/> + <location filename="../IconEditor/IconEditorWindow.py" line="258"/> <source>Save the current icon to a new file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="255"/> + <location filename="../IconEditor/IconEditorWindow.py" line="260"/> <source><b>Save As...</b><p>Saves the current icon to a new file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>Close</source> <translation>Fechar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>&Close</source> <translation>Fe&char</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>Ctrl+W</source> <comment>File|Close</comment> <translation>Ctrl+W</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="268"/> + <location filename="../IconEditor/IconEditorWindow.py" line="273"/> <source>Close the current icon editor window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="270"/> + <location filename="../IconEditor/IconEditorWindow.py" line="275"/> <source><b>Close</b><p>Closes the current icon editor window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="277"/> + <location filename="../IconEditor/IconEditorWindow.py" line="282"/> <source>Close All</source> <translation>Fechar Tudo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="277"/> + <location filename="../IconEditor/IconEditorWindow.py" line="282"/> <source>Close &All</source> <translation>Fechar &Tudo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="281"/> + <location filename="../IconEditor/IconEditorWindow.py" line="286"/> <source>Close all icon editor windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="283"/> + <location filename="../IconEditor/IconEditorWindow.py" line="288"/> <source><b>Close All</b><p>Closes all icon editor windows except the first one.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>Quit</source> <translation>Sair</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>&Quit</source> <translation>Sai&r</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>Ctrl+Q</source> <comment>File|Quit</comment> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="309"/> + <location filename="../IconEditor/IconEditorWindow.py" line="314"/> <source>Quit the icon editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="310"/> + <location filename="../IconEditor/IconEditorWindow.py" line="315"/> <source><b>Quit</b><p>Quit the icon editor.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Undo</source> <translation>Desfazer</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>&Undo</source> <translation>Desfa&zer</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Ctrl+Z</source> <comment>Edit|Undo</comment> <translation>Ctrl+Z</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Alt+Backspace</source> <comment>Edit|Undo</comment> <translation>Alt+Backspace</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="329"/> + <location filename="../IconEditor/IconEditorWindow.py" line="334"/> <source>Undo the last change</source> <translation>Desfazer a última alteração</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="330"/> + <location filename="../IconEditor/IconEditorWindow.py" line="335"/> <source><b>Undo</b><p>Undo the last change done.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>Redo</source> <translation>Refazer</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>&Redo</source> <translation>&Refazer</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>Ctrl+Shift+Z</source> <comment>Edit|Redo</comment> <translation>Ctrl+Shift+Z</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="343"/> + <location filename="../IconEditor/IconEditorWindow.py" line="348"/> <source>Redo the last change</source> <translation>Refazer a última alteração</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="344"/> + <location filename="../IconEditor/IconEditorWindow.py" line="349"/> <source><b>Redo</b><p>Redo the last change done.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Cut</source> <translation>Cortar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Cu&t</source> <translation>Cor&tar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Ctrl+X</source> <comment>Edit|Cut</comment> <translation>Ctrl+X</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Shift+Del</source> <comment>Edit|Cut</comment> <translation>Shift+Del</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="358"/> + <location filename="../IconEditor/IconEditorWindow.py" line="363"/> <source>Cut the selection</source> <translation>Cortar a seleção</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="359"/> + <location filename="../IconEditor/IconEditorWindow.py" line="364"/> <source><b>Cut</b><p>Cut the selected image area to the clipboard.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Copy</source> <translation>Copiar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>&Copy</source> <translation>&Copiar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Ctrl+C</source> <comment>Edit|Copy</comment> <translation>Ctrl+C</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Ctrl+Ins</source> <comment>Edit|Copy</comment> <translation>Ctrl+Ins</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="373"/> + <location filename="../IconEditor/IconEditorWindow.py" line="378"/> <source>Copy the selection</source> <translation>Copiar a seleção</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="374"/> + <location filename="../IconEditor/IconEditorWindow.py" line="379"/> <source><b>Copy</b><p>Copy the selected image area to the clipboard.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Paste</source> <translation>Colar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>&Paste</source> <translation>Co&lar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Ctrl+V</source> <comment>Edit|Paste</comment> <translation>Ctrl+V</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Shift+Ins</source> <comment>Edit|Paste</comment> <translation>Shift+Ins</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="388"/> + <location filename="../IconEditor/IconEditorWindow.py" line="393"/> <source>Paste the clipboard image</source> <translation>Cola a imagem da área de transferência</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="389"/> + <location filename="../IconEditor/IconEditorWindow.py" line="394"/> <source><b>Paste</b><p>Paste the clipboard image.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="396"/> + <location filename="../IconEditor/IconEditorWindow.py" line="401"/> <source>Paste as New</source> <translation>Colar como Novo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="396"/> + <location filename="../IconEditor/IconEditorWindow.py" line="401"/> <source>Paste as &New</source> <translation>Colar como &Novo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="400"/> + <location filename="../IconEditor/IconEditorWindow.py" line="405"/> <source>Paste the clipboard image replacing the current one</source> <translation>Cola a imagem da área de transferência e substitui a atual</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="402"/> + <location filename="../IconEditor/IconEditorWindow.py" line="407"/> <source><b>Paste as New</b><p>Paste the clipboard image replacing the current one.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Clear</source> <translation>Limpar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Cl&ear</source> <translation>Li&mpar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Alt+Shift+C</source> <comment>Edit|Clear</comment> <translation>Alt+Shift+C</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="416"/> + <location filename="../IconEditor/IconEditorWindow.py" line="421"/> <source>Clear the icon image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="417"/> + <location filename="../IconEditor/IconEditorWindow.py" line="422"/> <source><b>Clear</b><p>Clear the icon image and set it to be completely transparent.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>Select All</source> <translation>Selecionar Tudo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>&Select All</source> <translation>&Selecionar tudo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>Ctrl+A</source> <comment>Edit|Select All</comment> <translation>Ctrl+A</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="431"/> + <location filename="../IconEditor/IconEditorWindow.py" line="436"/> <source>Select the complete icon image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="433"/> + <location filename="../IconEditor/IconEditorWindow.py" line="438"/> <source><b>Select All</b><p>Selects the complete icon image.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="440"/> + <location filename="../IconEditor/IconEditorWindow.py" line="445"/> <source>Change Size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="440"/> + <location filename="../IconEditor/IconEditorWindow.py" line="445"/> <source>Change Si&ze...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="446"/> + <location filename="../IconEditor/IconEditorWindow.py" line="451"/> <source>Change the icon size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="447"/> + <location filename="../IconEditor/IconEditorWindow.py" line="452"/> <source><b>Change Size...</b><p>Changes the icon size.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="454"/> + <location filename="../IconEditor/IconEditorWindow.py" line="459"/> <source>Grayscale</source> <translation>Preto e Branco</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="454"/> + <location filename="../IconEditor/IconEditorWindow.py" line="459"/> <source>&Grayscale</source> <translation>Pr&eto e Branco</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="460"/> + <location filename="../IconEditor/IconEditorWindow.py" line="465"/> <source>Change the icon to grayscale</source> <translation>Mudar o ícone a preto e branco</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="462"/> + <location filename="../IconEditor/IconEditorWindow.py" line="467"/> <source><b>Grayscale</b><p>Changes the icon to grayscale.</p></source> <translation><b>Preto e Branco</b><p>Muda o ícone para preto e branco.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Zoom in</source> <translation>Aproximar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Zoom &in</source> <translation>Apro&ximar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Ctrl++</source> <comment>View|Zoom in</comment> <translation>Ctrl++</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="497"/> + <location filename="../IconEditor/IconEditorWindow.py" line="502"/> <source>Zoom in on the icon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="498"/> + <location filename="../IconEditor/IconEditorWindow.py" line="503"/> <source><b>Zoom in</b><p>Zoom in on the icon. This makes the grid bigger.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Zoom out</source> <translation>Afastar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Zoom &out</source> <translation>A&fastar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Ctrl+-</source> <comment>View|Zoom out</comment> <translation>Ctrl+-</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="511"/> + <location filename="../IconEditor/IconEditorWindow.py" line="516"/> <source>Zoom out on the icon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="512"/> + <location filename="../IconEditor/IconEditorWindow.py" line="517"/> <source><b>Zoom out</b><p>Zoom out on the icon. This makes the grid smaller.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Zoom reset</source> <translation>Restaurar zoom</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Zoom &reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Ctrl+0</source> <comment>View|Zoom reset</comment> <translation>Ctrl+0</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="525"/> + <location filename="../IconEditor/IconEditorWindow.py" line="530"/> <source>Reset the zoom of the icon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="527"/> + <location filename="../IconEditor/IconEditorWindow.py" line="532"/> <source><b>Zoom reset</b><p>Reset the zoom of the icon. This sets the zoom factor to 100%.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="535"/> + <location filename="../IconEditor/IconEditorWindow.py" line="540"/> <source>Show Grid</source> <translation>Mostrar Grelha</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="535"/> + <location filename="../IconEditor/IconEditorWindow.py" line="540"/> <source>Show &Grid</source> <translation>Mostrar &Grelha</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="541"/> + <location filename="../IconEditor/IconEditorWindow.py" line="546"/> <source>Toggle the display of the grid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="543"/> + <location filename="../IconEditor/IconEditorWindow.py" line="548"/> <source><b>Show Grid</b><p>Toggle the display of the grid.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="562"/> + <location filename="../IconEditor/IconEditorWindow.py" line="567"/> <source>Freehand</source> <translation>Mão Livre</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="562"/> + <location filename="../IconEditor/IconEditorWindow.py" line="567"/> <source>&Freehand</source> <translation>Mão &Livre</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="568"/> + <location filename="../IconEditor/IconEditorWindow.py" line="573"/> <source><b>Free hand</b><p>Draws non linear lines.</p></source> <translation><b>Mão Livre</b><p>Desenha linhas não lineares.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="577"/> + <location filename="../IconEditor/IconEditorWindow.py" line="582"/> <source>Color Picker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="577"/> + <location filename="../IconEditor/IconEditorWindow.py" line="582"/> <source>&Color Picker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="583"/> + <location filename="../IconEditor/IconEditorWindow.py" line="588"/> <source><b>Color Picker</b><p>The color of the pixel clicked on will become the current draw color.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="594"/> + <location filename="../IconEditor/IconEditorWindow.py" line="599"/> <source>Rectangle</source> <translation>Rectangulo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="594"/> + <location filename="../IconEditor/IconEditorWindow.py" line="599"/> <source>&Rectangle</source> <translation>&Rectangulo</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="600"/> + <location filename="../IconEditor/IconEditorWindow.py" line="605"/> <source><b>Rectangle</b><p>Draw a rectangle.</p></source> <translation><b>Rectangulo</b><p>Desenha um rectangulo.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="609"/> + <location filename="../IconEditor/IconEditorWindow.py" line="614"/> <source>Filled Rectangle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="609"/> + <location filename="../IconEditor/IconEditorWindow.py" line="614"/> <source>F&illed Rectangle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="615"/> + <location filename="../IconEditor/IconEditorWindow.py" line="620"/> <source><b>Filled Rectangle</b><p>Draw a filled rectangle.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="625"/> + <location filename="../IconEditor/IconEditorWindow.py" line="630"/> <source>Circle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="631"/> + <location filename="../IconEditor/IconEditorWindow.py" line="636"/> <source><b>Circle</b><p>Draw a circle.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="640"/> + <location filename="../IconEditor/IconEditorWindow.py" line="645"/> <source>Filled Circle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="640"/> + <location filename="../IconEditor/IconEditorWindow.py" line="645"/> <source>Fille&d Circle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="646"/> + <location filename="../IconEditor/IconEditorWindow.py" line="651"/> <source><b>Filled Circle</b><p>Draw a filled circle.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="656"/> + <location filename="../IconEditor/IconEditorWindow.py" line="661"/> <source>Ellipse</source> <translation>Elipse</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="656"/> + <location filename="../IconEditor/IconEditorWindow.py" line="661"/> <source>&Ellipse</source> <translation>&Elipse</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="662"/> + <location filename="../IconEditor/IconEditorWindow.py" line="667"/> <source><b>Ellipse</b><p>Draw an ellipse.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="671"/> + <location filename="../IconEditor/IconEditorWindow.py" line="676"/> <source>Filled Ellipse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="671"/> + <location filename="../IconEditor/IconEditorWindow.py" line="676"/> <source>Fille&d Elli&pse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="677"/> + <location filename="../IconEditor/IconEditorWindow.py" line="682"/> <source><b>Filled Ellipse</b><p>Draw a filled ellipse.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="687"/> + <location filename="../IconEditor/IconEditorWindow.py" line="692"/> <source>Flood Fill</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="687"/> + <location filename="../IconEditor/IconEditorWindow.py" line="692"/> <source>Fl&ood Fill</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="693"/> + <location filename="../IconEditor/IconEditorWindow.py" line="698"/> <source><b>Flood Fill</b><p>Fill adjoining pixels with the same color with the current color.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="703"/> + <location filename="../IconEditor/IconEditorWindow.py" line="708"/> <source>Line</source> <translation>Linha</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="703"/> + <location filename="../IconEditor/IconEditorWindow.py" line="708"/> <source>&Line</source> <translation>&Linha</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="709"/> + <location filename="../IconEditor/IconEditorWindow.py" line="714"/> <source><b>Line</b><p>Draw a line.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="718"/> + <location filename="../IconEditor/IconEditorWindow.py" line="723"/> <source>Eraser (Transparent)</source> <translation>Borracha (Transparente)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="718"/> + <location filename="../IconEditor/IconEditorWindow.py" line="723"/> <source>Eraser (&Transparent)</source> <translation>Borracha (&Transparente)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="724"/> + <location filename="../IconEditor/IconEditorWindow.py" line="729"/> <source><b>Eraser (Transparent)</b><p>Erase pixels by setting them to transparent.</p></source> <translation><b>Borracha (Transparente)</b><p>Apaga os pixels ao definir-los transparentes.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="733"/> + <location filename="../IconEditor/IconEditorWindow.py" line="738"/> <source>Rectangular Selection</source> <translation>Seleção Rectangular</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="750"/> + <location filename="../IconEditor/IconEditorWindow.py" line="755"/> <source>Rect&angular Selection</source> <translation>Seleção Rect&angular</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="739"/> + <location filename="../IconEditor/IconEditorWindow.py" line="744"/> <source><b>Rectangular Selection</b><p>Select a rectangular section of the icon using the mouse.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="750"/> + <location filename="../IconEditor/IconEditorWindow.py" line="755"/> <source>Circular Selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="756"/> + <location filename="../IconEditor/IconEditorWindow.py" line="761"/> <source><b>Circular Selection</b><p>Select a circular section of the icon using the mouse.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="773"/> + <location filename="../IconEditor/IconEditorWindow.py" line="778"/> <source>About</source> <translation>Acerca</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="773"/> + <location filename="../IconEditor/IconEditorWindow.py" line="778"/> <source>&About</source> <translation>A&cerca</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="777"/> + <location filename="../IconEditor/IconEditorWindow.py" line="782"/> <source>Display information about this software</source> <translation>Mostra a informação acerca deste software</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="779"/> + <location filename="../IconEditor/IconEditorWindow.py" line="784"/> <source><b>About</b><p>Display some information about this software.</p></source> <translation><b>Acerca</b><p>Mostra alguma informação acerca deste software.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="785"/> + <location filename="../IconEditor/IconEditorWindow.py" line="790"/> <source>About Qt</source> <translation>Acerca de Qt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="785"/> + <location filename="../IconEditor/IconEditorWindow.py" line="790"/> <source>About &Qt</source> <translation>Acerca de &Qt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="789"/> + <location filename="../IconEditor/IconEditorWindow.py" line="794"/> <source>Display information about the Qt toolkit</source> <translation>Mostra informação acerca das Ferramentas de Qt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="791"/> + <location filename="../IconEditor/IconEditorWindow.py" line="796"/> <source><b>About Qt</b><p>Display some information about the Qt toolkit.</p></source> <translation><b>Acerca de Qt</b><p>Mostra alguma informação acerca das Ferramentas de Qt.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>What's This?</source> <translation>O que é isto?</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>&What's This?</source> <translation>&Que é Isto?</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>Shift+F1</source> <comment>Help|What's This?'</comment> <translation>Shift+F1</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="804"/> + <location filename="../IconEditor/IconEditorWindow.py" line="809"/> <source>Context sensitive help</source> <translation>Ajuda sensível ao contexto</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="805"/> + <location filename="../IconEditor/IconEditorWindow.py" line="810"/> <source><b>Display context sensitive help</b><p>In What's This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.</p></source> <translation type="unfinished"><b>Mostrar ajuda sensível a contexto</b><p>No modo 'Que é Isto?' o cursor do rato mostra uma flecha com um ponto de interrogação, e pode clicar nos elementos da interface para ver uma breve descrição do que fazem e como se usam. Nas caixas de diálogo, pode-se aceder a esta característica através do botão de ajuda contextual da barra de título.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="822"/> + <location filename="../IconEditor/IconEditorWindow.py" line="827"/> <source>&File</source> <translation>&Ficheiro</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="839"/> + <location filename="../IconEditor/IconEditorWindow.py" line="844"/> <source>&Edit</source> <translation>&Editar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="855"/> + <location filename="../IconEditor/IconEditorWindow.py" line="860"/> <source>&View</source> <translation>&Vista</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="863"/> + <location filename="../IconEditor/IconEditorWindow.py" line="868"/> <source>&Tools</source> <translation>&Ferramentas</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="882"/> + <location filename="../IconEditor/IconEditorWindow.py" line="887"/> <source>&Help</source> <translation>&Ajuda</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="892"/> + <location filename="../IconEditor/IconEditorWindow.py" line="897"/> <source>File</source> <translation>Ficheiro</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="906"/> + <location filename="../IconEditor/IconEditorWindow.py" line="911"/> <source>Edit</source> <translation>Editar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="919"/> - <source>View</source> - <translation>Vista</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="924"/> + <source>View</source> + <translation>Vista</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="929"/> <source>Tools</source> <translation>Ferramentas</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="942"/> + <location filename="../IconEditor/IconEditorWindow.py" line="947"/> <source>Help</source> <translation>Ajuda</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="956"/> + <location filename="../IconEditor/IconEditorWindow.py" line="961"/> <source><p>This part of the status bar displays the icon size.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="963"/> + <location filename="../IconEditor/IconEditorWindow.py" line="968"/> <source><p>This part of the status bar displays the cursor position.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1059"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1064"/> <source>Open icon file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1109"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1114"/> <source>Save icon file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1109"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1114"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>O ficheiro <b>{0}</b> já existe. Sobreescrever?</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1145"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1150"/> <source>The file '{0}' does not exist.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1152"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1157"/> <source>Cannot read file '{0}: {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1186"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1191"/> <source>Cannot write file '{0}: {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1198"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1203"/> <source>Icon saved</source> <translation>Ícone gravado</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1213"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1218"/> <source>Untitled</source> <translation>Sem Título</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1217"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1222"/> <source>{0}[*] - {1}</source> <translation>{0}[*] - {1}</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1217"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1222"/> <source>Icon Editor</source> <translation>Editor de Ícones</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1238"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1243"/> <source>The icon image has unsaved changes.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../IconEditor/IconEditorWindow.py" line="135"/> + <source>JPEG File (*.jpeg)</source> + <translation>Ficheiro JPEG (*.jpeg)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="144"/> + <source>Compressed Scalable Vector Graphics File (*.svgz)</source> + <translation>Ficheiro Comprimido de Gráficos de Vectores Escaláveis (*.svgz)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="148"/> + <source>TIFF File (*.tiff)</source> + <translation>Ficheiros TIFF (*.tiff)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="149"/> + <source>WAP Bitmap File (*.wbmp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="1243"/> + <source>eric6 Icon Editor</source> + <translation>Editor de Icones de eric6</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="1333"/> + <source>About eric6 Icon Editor</source> + <translation>Acerca do Editor de Icones de eric6</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="1333"/> + <source>The eric6 Icon Editor is a simple editor component to perform icon drawing tasks.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="295"/> + <source>Close Others</source> + <translation type="unfinished">Fechar Outros</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="299"/> + <source>Close all other icon editor windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="301"/> + <source><b>Close Others</b><p>Closes all other icon editor windows.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="150"/> + <source>WebP Image File (*.webp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="128"/> + <source>Windows Cursor File (*.cur)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="129"/> + <source>DirectDraw-Surface File (*.dds)</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../IconEditor/IconEditorWindow.py" line="131"/> - <source>JPEG File (*.jpeg)</source> - <translation>Ficheiro JPEG (*.jpeg)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="140"/> - <source>Compressed Scalable Vector Graphics File (*.svgz)</source> - <translation>Ficheiro Comprimido de Gráficos de Vectores Escaláveis (*.svgz)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="144"/> - <source>TIFF File (*.tiff)</source> - <translation>Ficheiros TIFF (*.tiff)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="145"/> - <source>WAP Bitmap File (*.wbmp)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1238"/> - <source>eric6 Icon Editor</source> - <translation>Editor de Icones de eric6</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1328"/> - <source>About eric6 Icon Editor</source> - <translation>Acerca do Editor de Icones de eric6</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1328"/> - <source>The eric6 Icon Editor is a simple editor component to perform icon drawing tasks.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="290"/> - <source>Close Others</source> - <translation type="unfinished">Fechar Outros</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="294"/> - <source>Close all other icon editor windows</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="296"/> - <source><b>Close Others</b><p>Closes all other icon editor windows.</p></source> + <source>Apple Icon File (*.icns)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="133"/> + <source>JPEG2000 File (*.jp2)</source> <translation type="unfinished"></translation> </message> </context> @@ -32096,6 +32305,189 @@ </message> </context> <context> + <name>ImageMarkupDialog</name> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="53"/> + <source>Windows Bitmap File (*.bmp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="54"/> + <source>Windows Cursor File (*.cur)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="55"/> + <source>DirectDraw-Surface File (*.dds)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="56"/> + <source>Graphic Interchange Format File (*.gif)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="57"/> + <source>Apple Icon File (*.icns)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="58"/> + <source>Windows Icon File (*.ico)</source> + <translation type="unfinished">Ficheiro Icones de Windows (*.ico)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="59"/> + <source>JPEG2000 File (*.jp2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="60"/> + <source>JPEG File (*.jpg)</source> + <translation type="unfinished">Ficheiro JPEG (*.jpg)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="61"/> + <source>JPEG File (*.jpeg)</source> + <translation type="unfinished">Ficheiro JPEG (*.jpeg)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="62"/> + <source>Multiple-Image Network Graphics File (*.mng)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="63"/> + <source>Portable Bitmap File (*.pbm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="64"/> + <source>Paintbrush Bitmap File (*.pcx)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="65"/> + <source>Portable Graymap File (*.pgm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="66"/> + <source>Portable Network Graphics File (*.png)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="67"/> + <source>Portable Pixmap File (*.ppm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="68"/> + <source>Silicon Graphics Image File (*.sgi)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="69"/> + <source>Scalable Vector Graphics File (*.svg)</source> + <translation type="unfinished">Ficheiro de Gráficos de Vectores Escaláveis (*.svg)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="70"/> + <source>Compressed Scalable Vector Graphics File (*.svgz)</source> + <translation type="unfinished">Ficheiro Comprimido de Gráficos de Vectores Escaláveis (*.svgz)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="72"/> + <source>Targa Graphic File (*.tga)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="73"/> + <source>TIFF File (*.tif)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="74"/> + <source>TIFF File (*.tiff)</source> + <translation type="unfinished">Ficheiros TIFF (*.tiff)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="75"/> + <source>WAP Bitmap File (*.wbmp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="76"/> + <source>WebP Image File (*.webp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="77"/> + <source>X11 Bitmap File (*.xbm)</source> + <translation type="unfinished">Ficheiro Bitmap X11 (*.xbm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="78"/> + <source>X11 Pixmap File (*.xpm)</source> + <translation type="unfinished">Ficheiro Pixmap X11 (*.xpm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="89"/> + <source>All Files (*)</source> + <translation type="unfinished">Ficheiros Todos (*)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="14"/> + <source>Add Image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="25"/> + <source>Image Address:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="41"/> + <source>Enter the image path or URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="48"/> + <source>Title:</source> + <translation type="unfinished">Título:</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="58"/> + <source>Alternative Text:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="73"/> + <source>Keep Original Size</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="80"/> + <source>Keep Aspect Ratio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="89"/> + <source>Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="119"/> + <source> px</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="109"/> + <source>Height:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ImagesIcon</name> <message> <location filename="../WebBrowser/StatusBar/ImagesIcon.py" line="40"/> @@ -34975,7 +35367,7 @@ <translation>Selecionar o analizador léxico alternativo</translation> </message> <message> - <location filename="../Project/LexerAssociationDialog.py" line="131"/> + <location filename="../Project/LexerAssociationDialog.py" line="134"/> <source>Alternative</source> <translation>Alternativa</translation> </message> @@ -35321,490 +35713,510 @@ <translation></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="115"/> + <location filename="../QScintilla/Lexers/__init__.py" line="119"/> <source>Pascal</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="117"/> - <source>Perl</source> - <translation></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="119"/> - <source>PostScript</source> - <translation>PostScript</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="121"/> - <source>Povray</source> + <source>Perl</source> <translation></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="123"/> + <source>PostScript</source> + <translation>PostScript</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="125"/> + <source>Povray</source> + <translation></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="127"/> <source>Properties</source> <translation>Propriedades</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="131"/> - <source>Ruby</source> - <translation></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="133"/> - <source>SQL</source> - <translation></translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="135"/> - <source>TCL</source> + <source>Ruby</source> <translation></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="137"/> - <source>TeX</source> + <source>SQL</source> <translation></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="139"/> - <source>VHDL</source> + <source>TCL</source> <translation></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="141"/> - <source>XML</source> + <source>TeX</source> <translation></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="143"/> + <source>VHDL</source> + <translation></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="145"/> + <source>XML</source> + <translation></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="147"/> <source>YAML</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="171"/> + <location filename="../QScintilla/Lexers/__init__.py" line="175"/> <source>Pygments</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="365"/> + <location filename="../QScintilla/Lexers/__init__.py" line="375"/> <source>Python Files (*.py *.py2 *.py3)</source> <translation>Ficheiros Python (*.py *.py2 *.py3)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="368"/> + <location filename="../QScintilla/Lexers/__init__.py" line="378"/> <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> <translation>Ficheiros GUI de Python (*.pyw *.pyw2 *.pyw3)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="547"/> + <location filename="../QScintilla/Lexers/__init__.py" line="565"/> <source>Pyrex Files (*.pyx)</source> <translation>Ficheiros Pyrex (*.pyx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="550"/> + <location filename="../QScintilla/Lexers/__init__.py" line="568"/> <source>Quixote Template Files (*.ptl)</source> <translation>Ficheiros Modelos de Quixote (*.ptl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="553"/> + <location filename="../QScintilla/Lexers/__init__.py" line="571"/> <source>Ruby Files (*.rb)</source> <translation>Ficheiros Ruby (*.rb)</translation> </message> <message> + <location filename="../QScintilla/Lexers/__init__.py" line="574"/> + <source>IDL Files (*.idl)</source> + <translation>Ficheiros IDL (*.idl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="393"/> + <source>C Files (*.h *.c)</source> + <translation>Ficheiros C (*.h *.c)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="396"/> + <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> + <translation>Ficheiros C++ (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="586"/> + <source>C# Files (*.cs)</source> + <translation>Ficheiros C# (*.cs)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="402"/> + <source>HTML Files (*.html *.htm *.asp *.shtml)</source> + <translation>Ficheiros HTML (*.html *.htm *.asp *.shtml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="598"/> + <source>CSS Files (*.css)</source> + <translation>Ficheiros CSS (*.css)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="601"/> + <source>QSS Files (*.qss)</source> + <translation>Ficheiros QSS (*.qss)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="411"/> + <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> + <translation>Ficheiros PHP (*.php *.php3 *.php4 *.php5 *.phtml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="414"/> + <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> + <translation>Ficheiros XML (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="613"/> + <source>Qt Resource Files (*.qrc)</source> + <translation>Ficheiro de Recursos Qt (*.qrc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="420"/> + <source>D Files (*.d *.di)</source> + <translation>Ficheiros D (*.d *.di)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="622"/> + <source>Java Files (*.java)</source> + <translation>Ficheiros Java (*.java)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="625"/> + <source>JavaScript Files (*.js)</source> + <translation>Ficheiros JavaScript (*.js)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="628"/> + <source>SQL Files (*.sql)</source> + <translation>Ficheiros SQL (*.sql)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="631"/> + <source>Docbook Files (*.docbook)</source> + <translation>Ficheiros Docbook (*.docbook)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="435"/> + <source>Perl Files (*.pl *.pm *.ph)</source> + <translation>Ficheiros Perl (*.pl *.pm *.ph)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="640"/> + <source>Lua Files (*.lua)</source> + <translation>Ficheiros Lua (*.lua)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="441"/> + <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> + <translation>Ficheiros Tex (*.tex *.sty *.aux *.toc *.idx)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="643"/> + <source>Shell Files (*.sh)</source> + <translation>Ficheiros Shell (*.sh)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="447"/> + <source>Batch Files (*.bat *.cmd)</source> + <translation>Ficheiros Batch (*.bat *.cmd)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> + <source>Diff Files (*.diff *.patch)</source> + <translation>Ficheiros Diff (*.diff *.patch)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="453"/> + <source>Makefiles (*.mak)</source> + <translation>Ficheiros Makefile (*.mak)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="456"/> + <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> + <translation>Ficheiros Propriedades (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="667"/> + <source>Povray Files (*.pov)</source> + <translation>Ficheiros Povray (*.pov)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="463"/> + <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> + <translation>Ficheiros CMake (CMakeLists.txt *.cmake *.ctest)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="466"/> + <source>VHDL Files (*.vhd *.vhdl)</source> + <translation>Ficheiros VHDL (*.vhd *.vhdl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="469"/> + <source>TCL/Tk Files (*.tcl *.tk)</source> + <translation>Ficheiros TCL/Tk (*.tcl *.tk)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="472"/> + <source>Fortran Files (*.f90 *.f95 *.f2k)</source> + <translation>Ficheiros Fortran (*.f90 *.f95 *.f2k)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="475"/> + <source>Fortran77 Files (*.f *.for)</source> + <translation>Ficheiros Fortran77 (*.f *.for)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="478"/> + <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> + <translation>Ficheiros Pascal (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="694"/> + <source>PostScript Files (*.ps)</source> + <translation>Ficheiros PostScript (*.ps)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="484"/> + <source>YAML Files (*.yaml *.yml)</source> + <translation>Ficheiros YAML (*.yaml *.yml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="744"/> + <source>All Files (*)</source> + <translation>Ficheiros Todos (*)</translation> + </message> + <message> <location filename="../QScintilla/Lexers/__init__.py" line="556"/> - <source>IDL Files (*.idl)</source> - <translation>Ficheiros IDL (*.idl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="383"/> - <source>C Files (*.h *.c)</source> - <translation>Ficheiros C (*.h *.c)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="386"/> - <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> - <translation>Ficheiros C++ (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="568"/> - <source>C# Files (*.cs)</source> - <translation>Ficheiros C# (*.cs)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="392"/> - <source>HTML Files (*.html *.htm *.asp *.shtml)</source> - <translation>Ficheiros HTML (*.html *.htm *.asp *.shtml)</translation> + <source>Python3 Files (*.py)</source> + <translation>Ficheiros Python3 (*.py)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="562"/> + <source>Python3 GUI Files (*.pyw)</source> + <translation>Ficheiros GUI de Python3 (*.pyw)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="577"/> + <source>C Files (*.c)</source> + <translation>Ficheiros C (*.c)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="580"/> - <source>CSS Files (*.css)</source> - <translation>Ficheiros CSS (*.css)</translation> + <source>C++ Files (*.cpp)</source> + <translation>Ficheiros C++ (*.cpp)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="583"/> - <source>QSS Files (*.qss)</source> - <translation>Ficheiros QSS (*.qss)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="401"/> - <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> - <translation>Ficheiros PHP (*.php *.php3 *.php4 *.php5 *.phtml)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="404"/> - <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> - <translation>Ficheiros XML (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation> + <source>C++/C Header Files (*.h)</source> + <translation>Ficheiros de Cabeçalho C++/C (*.h)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="589"/> + <source>HTML Files (*.html)</source> + <translation>Ficheiros HTML (*.html)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="592"/> + <source>PHP Files (*.php)</source> + <translation>Ficheiros PHP (*.php)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="595"/> - <source>Qt Resource Files (*.qrc)</source> - <translation>Ficheiro de Recursos Qt (*.qrc)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="410"/> - <source>D Files (*.d *.di)</source> - <translation>Ficheiros D (*.d *.di)</translation> + <source>ASP Files (*.asp)</source> + <translation>Ficheiros ASP (*.asp)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="604"/> - <source>Java Files (*.java)</source> - <translation>Ficheiros Java (*.java)</translation> + <source>XML Files (*.xml)</source> + <translation>Ficheiros XML (*.xml)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="607"/> - <source>JavaScript Files (*.js)</source> - <translation>Ficheiros JavaScript (*.js)</translation> + <source>XSL Files (*.xsl)</source> + <translation>Ficheiros XSL (*.xsl)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="610"/> - <source>SQL Files (*.sql)</source> - <translation>Ficheiros SQL (*.sql)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="613"/> - <source>Docbook Files (*.docbook)</source> - <translation>Ficheiros Docbook (*.docbook)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="425"/> - <source>Perl Files (*.pl *.pm *.ph)</source> - <translation>Ficheiros Perl (*.pl *.pm *.ph)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="622"/> - <source>Lua Files (*.lua)</source> - <translation>Ficheiros Lua (*.lua)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="431"/> - <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> - <translation>Ficheiros Tex (*.tex *.sty *.aux *.toc *.idx)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="625"/> - <source>Shell Files (*.sh)</source> - <translation>Ficheiros Shell (*.sh)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="437"/> - <source>Batch Files (*.bat *.cmd)</source> - <translation>Ficheiros Batch (*.bat *.cmd)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="440"/> - <source>Diff Files (*.diff *.patch)</source> - <translation>Ficheiros Diff (*.diff *.patch)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="443"/> - <source>Makefiles (*.mak)</source> - <translation>Ficheiros Makefile (*.mak)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="446"/> - <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> - <translation>Ficheiros Propriedades (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> + <source>DTD Files (*.dtd)</source> + <translation>Ficheiros DTD (*.dtd)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="616"/> + <source>D Files (*.d)</source> + <translation>Ficheiros D (*.d)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="619"/> + <source>D Interface Files (*.di)</source> + <translation>Ficheiros Interface D (*.di)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="634"/> + <source>Perl Files (*.pl)</source> + <translation>Ficheiros Perl (*.pl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="637"/> + <source>Perl Module Files (*.pm)</source> + <translation>Ficheiros Módulos Perl (*.pm)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="646"/> + <source>Batch Files (*.bat)</source> + <translation>Ficheiros Batch (*.bat)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="649"/> - <source>Povray Files (*.pov)</source> - <translation>Ficheiros Povray (*.pov)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="453"/> - <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> - <translation>Ficheiros CMake (CMakeLists.txt *.cmake *.ctest)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="456"/> - <source>VHDL Files (*.vhd *.vhdl)</source> - <translation>Ficheiros VHDL (*.vhd *.vhdl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="459"/> - <source>TCL/Tk Files (*.tcl *.tk)</source> - <translation>Ficheiros TCL/Tk (*.tcl *.tk)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="462"/> - <source>Fortran Files (*.f90 *.f95 *.f2k)</source> - <translation>Ficheiros Fortran (*.f90 *.f95 *.f2k)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="465"/> - <source>Fortran77 Files (*.f *.for)</source> - <translation>Ficheiros Fortran77 (*.f *.for)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="468"/> - <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> - <translation>Ficheiros Pascal (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</translation> + <source>TeX Files (*.tex)</source> + <translation>Ficheiros TeX (*.tex)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="652"/> + <source>TeX Template Files (*.sty)</source> + <translation>Ficheiros Modelos TeX (*.sty)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="655"/> + <source>Diff Files (*.diff)</source> + <translation>Ficheiros Diff (*.diff)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="658"/> + <source>Make Files (*.mak)</source> + <translation>Ficheiros Make (*.mak)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="661"/> + <source>Properties Files (*.ini)</source> + <translation>Ficheiros de Propriedades (*.ini)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="664"/> + <source>Configuration Files (*.cfg)</source> + <translation>Ficheiros de Configuração (*.cfg)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="670"/> + <source>CMake Files (CMakeLists.txt)</source> + <translation>Ficheiros CMake (CMakeLists.txt)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="673"/> + <source>CMake Macro Files (*.cmake)</source> + <translation>Ficheiros Macro CMake (*.cmake)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="676"/> - <source>PostScript Files (*.ps)</source> - <translation>Ficheiros PostScript (*.ps)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="474"/> - <source>YAML Files (*.yaml *.yml)</source> - <translation>Ficheiros YAML (*.yaml *.yml)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="718"/> - <source>All Files (*)</source> - <translation>Ficheiros Todos (*)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="538"/> - <source>Python3 Files (*.py)</source> - <translation>Ficheiros Python3 (*.py)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="544"/> - <source>Python3 GUI Files (*.pyw)</source> - <translation>Ficheiros GUI de Python3 (*.pyw)</translation> + <source>VHDL Files (*.vhd)</source> + <translation>Ficheiros VHDL (*.vhd)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="679"/> + <source>TCL Files (*.tcl)</source> + <translation>Ficheiros TCL (*.tcl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="682"/> + <source>Tk Files (*.tk)</source> + <translation>Ficheiros Tk (*.tk)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="685"/> + <source>Fortran Files (*.f95)</source> + <translation>Ficheiros Fortran (*.f95)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="688"/> + <source>Fortran77 Files (*.f)</source> + <translation>Ficheiros Fortran77 (*.f)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="691"/> + <source>Pascal Files (*.pas)</source> + <translation>Ficheiros Pascal (*.pas)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="697"/> + <source>YAML Files (*.yml)</source> + <translation>Ficheiros YAML (*.yml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="553"/> + <source>Python2 Files (*.py2)</source> + <translation>Ficheiros Python2 (*.py2)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="559"/> - <source>C Files (*.c)</source> - <translation>Ficheiros C (*.c)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="562"/> - <source>C++ Files (*.cpp)</source> - <translation>Ficheiros C++ (*.cpp)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="565"/> - <source>C++/C Header Files (*.h)</source> - <translation>Ficheiros de Cabeçalho C++/C (*.h)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="571"/> - <source>HTML Files (*.html)</source> - <translation>Ficheiros HTML (*.html)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="574"/> - <source>PHP Files (*.php)</source> - <translation>Ficheiros PHP (*.php)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="577"/> - <source>ASP Files (*.asp)</source> - <translation>Ficheiros ASP (*.asp)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="586"/> - <source>XML Files (*.xml)</source> - <translation>Ficheiros XML (*.xml)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="589"/> - <source>XSL Files (*.xsl)</source> - <translation>Ficheiros XSL (*.xsl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="592"/> - <source>DTD Files (*.dtd)</source> - <translation>Ficheiros DTD (*.dtd)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="598"/> - <source>D Files (*.d)</source> - <translation>Ficheiros D (*.d)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="601"/> - <source>D Interface Files (*.di)</source> - <translation>Ficheiros Interface D (*.di)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="616"/> - <source>Perl Files (*.pl)</source> - <translation>Ficheiros Perl (*.pl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="619"/> - <source>Perl Module Files (*.pm)</source> - <translation>Ficheiros Módulos Perl (*.pm)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="628"/> - <source>Batch Files (*.bat)</source> - <translation>Ficheiros Batch (*.bat)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="631"/> - <source>TeX Files (*.tex)</source> - <translation>Ficheiros TeX (*.tex)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="634"/> - <source>TeX Template Files (*.sty)</source> - <translation>Ficheiros Modelos TeX (*.sty)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="637"/> - <source>Diff Files (*.diff)</source> - <translation>Ficheiros Diff (*.diff)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="640"/> - <source>Make Files (*.mak)</source> - <translation>Ficheiros Make (*.mak)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="643"/> - <source>Properties Files (*.ini)</source> - <translation>Ficheiros de Propriedades (*.ini)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="646"/> - <source>Configuration Files (*.cfg)</source> - <translation>Ficheiros de Configuração (*.cfg)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="652"/> - <source>CMake Files (CMakeLists.txt)</source> - <translation>Ficheiros CMake (CMakeLists.txt)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="655"/> - <source>CMake Macro Files (*.cmake)</source> - <translation>Ficheiros Macro CMake (*.cmake)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="658"/> - <source>VHDL Files (*.vhd)</source> - <translation>Ficheiros VHDL (*.vhd)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="661"/> - <source>TCL Files (*.tcl)</source> - <translation>Ficheiros TCL (*.tcl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="664"/> - <source>Tk Files (*.tk)</source> - <translation>Ficheiros Tk (*.tk)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="667"/> - <source>Fortran Files (*.f95)</source> - <translation>Ficheiros Fortran (*.f95)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="670"/> - <source>Fortran77 Files (*.f)</source> - <translation>Ficheiros Fortran77 (*.f)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="673"/> - <source>Pascal Files (*.pas)</source> - <translation>Ficheiros Pascal (*.pas)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="679"/> - <source>YAML Files (*.yml)</source> - <translation>Ficheiros YAML (*.yml)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="535"/> - <source>Python2 Files (*.py2)</source> - <translation>Ficheiros Python2 (*.py2)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="541"/> <source>Python2 GUI Files (*.pyw2)</source> <translation>Ficheiros GUI de Python2 (*.pyw2)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="125"/> - <source>Python2</source> - <translation></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="127"/> - <source>Python3</source> - <translation></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="148"/> - <source>Matlab</source> - <translation></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="148"/> - <source>Octave</source> - <translation>Octave</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="480"/> - <source>Matlab Files (*.m *.m.matlab)</source> - <translation>Ficheiros Matlab (*.m *.m.matlab)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="685"/> - <source>Matlab Files (*.m)</source> - <translation>Ficheiros Matlab (*.m)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="685"/> - <source>Octave Files (*.m.octave)</source> - <translation>Ficheiros Octave (*.m.octave)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="480"/> - <source>Octave Files (*.m *.m.octave)</source> - <translation>Ficheiros Octave (*.m *.m.octave)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="129"/> + <source>Python2</source> + <translation></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="131"/> + <source>Python3</source> + <translation></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="115"/> + <source>Matlab</source> + <translation></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="117"/> + <source>Octave</source> + <translation>Octave</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="487"/> + <source>Matlab Files (*.m *.m.matlab)</source> + <translation>Ficheiros Matlab (*.m *.m.matlab)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="700"/> + <source>Matlab Files (*.m)</source> + <translation>Ficheiros Matlab (*.m)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="703"/> + <source>Octave Files (*.m.octave)</source> + <translation>Ficheiros Octave (*.m.octave)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="490"/> + <source>Octave Files (*.m *.m.octave)</source> + <translation>Ficheiros Octave (*.m *.m.octave)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="133"/> <source>QSS</source> <translation>QSS</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="157"/> + <location filename="../QScintilla/Lexers/__init__.py" line="153"/> <source>Gettext</source> <translation>Gettext</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="162"/> + <location filename="../QScintilla/Lexers/__init__.py" line="158"/> <source>CoffeeScript</source> <translation>CoffeeScript</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="695"/> + <location filename="../QScintilla/Lexers/__init__.py" line="709"/> <source>Gettext Files (*.po)</source> <translation>Ficheiros Gettext (*.po)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="702"/> + <location filename="../QScintilla/Lexers/__init__.py" line="716"/> <source>CoffeeScript Files (*.coffee)</source> <translation>Ficheiros CoffeeScript (*.coffee)</translation> </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="163"/> + <source>JSON</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="723"/> + <source>JSON Files (*.json)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="166"/> + <source>Markdown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="728"/> + <source>Markdown Files (*.md)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>LfConvertDataDialog</name> @@ -36017,6 +36429,19 @@ </message> </context> <context> + <name>MarkdownProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/MarkdownProvider.py" line="383"/> + <source>Create List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/MarkdownProvider.py" line="383"/> + <source>Enter desired number of list elements:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>MasterPasswordEntryDialog</name> <message> <location filename="../Preferences/ConfigurationPages/MasterPasswordEntryDialog.ui" line="14"/> @@ -36092,12 +36517,12 @@ <context> <name>McCabeChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="423"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="426"/> <source>'{0}' is too complex ({1})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="425"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="428"/> <source>{0}: {1}</source> <translation type="unfinished">{0}: {1}</translation> </message> @@ -36125,103 +36550,98 @@ <translation>Introduzir o número de mensagens de registo a mostrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="155"/> <source>Commit</source> <translation>Cometido</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="161"/> <source>No. of commit messages to remember:</source> <translation>Nº de mensagens de cometido a recordar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="168"/> <source>Enter the number of commit messages to remember</source> <translation>Introduzir o número de mensagens de cometido a recordar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="236"/> <source>Incoming / Outgoing</source> - <translation>Entrante / Sainte</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="222"/> - <source>Select to show the incoming and outgoing log in a log browser dialog</source> - <translation>Selecionar para mostrar o registos entrantes e saíntes numa caixa de diálogo do navegador de registos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="225"/> + <translation type="obsolete">Entrante / Sainte</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="242"/> + <source>Select to update the working directory to new tip</source> + <translation>Selecionar para atualizar o diretorio de trabalho à dica nova</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="245"/> <source>Use Log Browser for incoming / outgoing log</source> - <translation>Usar Navegador de Registos para registos entrantes / saíntes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="235"/> + <translation type="obsolete">Usar Navegador de Registos para registos entrantes / saíntes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="236"/> <source>Pull</source> <translation>Puxar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="241"/> - <source>Select to update the working directory to new tip</source> - <translation>Selecionar para atualizar o diretorio de trabalho à dica nova</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="245"/> <source>Update after pulling</source> <translation>Atualizar depois de puxar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="334"/> <source>Edit the Mercurial configuration file</source> <translation>Editar o ficheiro de configuração de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="337"/> <source>Edit configuration file</source> <translation>Editar ficheiro de configuração</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="311"/> <source>Cleanup</source> <translation>Limpar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="317"/> <source>Pattern:</source> <translation>Padrão:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="324"/> <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> <translation>Introduzir o padrão de nomes de ficheiro a usar para limpar (entradas separadas por um espaço)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="252"/> <source>Select to prefer unbundle over pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="255"/> <source><b>Prefer Unbundle</b> <p>If this option is selected, it will be checked, if a Mercurial changegroups file from a previous "Show Incoming" request exists. In this case it will be applied and deleted. Otherwise a pull request will be sent.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="259"/> <source>Prefer Unbundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="292"/> <source>Revert</source> <translation>Anular</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="298"/> <source>Select to create a backup file (.orig) before reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="301"/> <source>Create Backup Files</source> <translation>Criar Cópias de Segurança</translation> </message> @@ -36256,37 +36676,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="269"/> <source>Merge</source> <translation>Mesclar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="275"/> <source>Select to enforce usage of the Mercural internal merge tool</source> <translation>Selecionar para forçar o uso da ferramenta de mesclar interna de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="278"/> <source><b>Internal Merge Tool</b> <p>Select to enforce usage of the Mercural internal merge tool,which leaves conflict markers in the file in case of conflicting changes.</p></source> <translation><b>Ferramenta de Mesclar Interna</b> <p>Selecionar para forçar o uso da ferramenta de mesclar interna de Mercural, a qual deixa marcadores de conflito no ficheiro em caso de alterações conflitivas.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="282"/> <source>Use internal merge with conflict markers</source> <translation>Usar mesclar interno com marcadores de conflito</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="197"/> <source>No. of commit authors to remember:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="204"/> <source>Enter the number of commit authors to remember</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="132"/> + <source>No. of message characters shown in list:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="139"/> + <source>Enter the number of characters of the commit message to be shown in the list</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -37245,107 +37675,107 @@ <context> <name>MiscellaneousChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="429"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="432"/> <source>coding magic comment not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="432"/> - <source>unknown encoding ({0}) found in coding magic comment</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="435"/> - <source>copyright notice not present</source> + <source>unknown encoding ({0}) found in coding magic comment</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="438"/> - <source>copyright notice contains invalid author</source> + <source>copyright notice not present</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="441"/> - <source>blind except: statement</source> + <source>copyright notice contains invalid author</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="444"/> - <source>found {0} formatter</source> + <source>blind except: statement</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="447"/> - <source>format string does contain unindexed parameters</source> + <source>found {0} formatter</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="450"/> - <source>docstring does contain unindexed parameters</source> + <source>format string does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="453"/> - <source>other string does contain unindexed parameters</source> + <source>docstring does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="456"/> - <source>format call uses too large index ({0})</source> + <source>other string does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="459"/> - <source>format call uses missing keyword ({0})</source> + <source>format call uses too large index ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="462"/> - <source>format call uses keyword arguments but no named entries</source> + <source>format call uses missing keyword ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="465"/> - <source>format call uses variable arguments but no numbered entries</source> + <source>format call uses keyword arguments but no named entries</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="468"/> - <source>format call uses implicit and explicit indexes together</source> + <source>format call uses variable arguments but no numbered entries</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="471"/> - <source>format call provides unused index ({0})</source> + <source>format call uses implicit and explicit indexes together</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="474"/> - <source>format call provides unused keyword ({0})</source> + <source>format call provides unused index ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="477"/> - <source>expected these __future__ imports: {0}; but only got: {1}</source> + <source>format call provides unused keyword ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="480"/> - <source>expected these __future__ imports: {0}; but got none</source> + <source>expected these __future__ imports: {0}; but only got: {1}</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="483"/> - <source>print statement found</source> + <source>expected these __future__ imports: {0}; but got none</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="486"/> - <source>one element tuple found</source> + <source>print statement found</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="489"/> + <source>one element tuple found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="492"/> <source>{0}: {1}</source> <translation type="unfinished">{0}: {1}</translation> </message> @@ -37743,72 +38173,72 @@ <context> <name>NamingStyleChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="378"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> <source>class names should use CapWords convention</source> <translation>nomes de classes devem usar a convenção de Maiúsculas</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> - <source>function name should be lowercase</source> - <translation>nome de função deve estar em minúsculas</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="384"/> - <source>argument name should be lowercase</source> - <translation>nome do argumento deve ser em minúsculas</translation> + <source>function name should be lowercase</source> + <translation>nome de função deve estar em minúsculas</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="387"/> - <source>first argument of a class method should be named 'cls'</source> - <translation type="unfinished"></translation> + <source>argument name should be lowercase</source> + <translation>nome do argumento deve ser em minúsculas</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="390"/> - <source>first argument of a method should be named 'self'</source> - <translation>primeiro argumento de um método deve chamar-se 'self'</translation> + <source>first argument of a class method should be named 'cls'</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="393"/> + <source>first argument of a method should be named 'self'</source> + <translation>primeiro argumento de um método deve chamar-se 'self'</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="396"/> <source>first argument of a static method should not be named 'self' or 'cls</source> <translation>primeiro argumento de um método estático não deve chamar-se 'self' ou 'cls</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="397"/> - <source>module names should be lowercase</source> - <translation>nomes de módulos devem estar em minúsculas</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="400"/> - <source>package names should be lowercase</source> - <translation>nomes de pacotes devem ser em minúsculas</translation> + <source>module names should be lowercase</source> + <translation>nomes de módulos devem estar em minúsculas</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="403"/> - <source>constant imported as non constant</source> - <translation type="unfinished"></translation> + <source>package names should be lowercase</source> + <translation>nomes de pacotes devem ser em minúsculas</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="406"/> - <source>lowercase imported as non lowercase</source> + <source>constant imported as non constant</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="409"/> - <source>camelcase imported as lowercase</source> + <source>lowercase imported as non lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="412"/> - <source>camelcase imported as constant</source> + <source>camelcase imported as lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="415"/> - <source>variable in function should be lowercase</source> - <translation>variável na função deve estar em minúsculas</translation> + <source>camelcase imported as constant</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="418"/> + <source>variable in function should be lowercase</source> + <translation>variável na função deve estar em minúsculas</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="421"/> <source>names 'l', 'O' and 'I' should be avoided</source> <translation>nomes 'I', 'O' e 'l' devem ser evitados</translation> </message> @@ -40189,27 +40619,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1525"/> + <location filename="../Preferences/__init__.py" line="1530"/> <source>Export Preferences</source> <translation>Exportar Preferências</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1553"/> + <location filename="../Preferences/__init__.py" line="1558"/> <source>Import Preferences</source> <translation>Importar Preferências</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1553"/> + <location filename="../Preferences/__init__.py" line="1558"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Ficheiro de Propriedades (*.ini);;Ficheiros Todos (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1655"/> + <location filename="../Preferences/__init__.py" line="1660"/> <source>Select Python{0} Interpreter</source> <translation>Selecionar intérprete de Python{0}</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1655"/> + <location filename="../Preferences/__init__.py" line="1660"/> <source>Select the Python{0} interpreter to be used:</source> <translation>Selecionar o intérprete de Python{0} a usar:</translation> </message> @@ -40235,20 +40665,20 @@ <translation><p>A antevisão para este tipo de ficheiro não está disponível.</p></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="597"/> - <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/Previewers/PreviewerHTML.py" line="510"/> <source><p>ReStructuredText preview requires the <b>sphinx</b> package.<br/>Install it with your package manager,'pip install Sphinx' or see <a href="http://pypi.python.org/pypi/Sphinx">this page.</a></p><p>Alternatively you may disable Sphinx usage on the Editor, Filehandling configuration page.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="572"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="565"/> <source><p>ReStructuredText preview requires the <b>python-docutils</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pypi.python.org/pypi/docutils">this page.</a></p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../UI/Previewers/PreviewerHTML.py" line="590"/> + <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PreviewerHTML</name> @@ -40273,17 +40703,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="177"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="179"/> <source><p>No preview available for this type of file.</p></source> <translation><p>A antevisão para este tipo de ficheiro não está disponível.</p></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="225"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="230"/> <source>Preview - {0}</source> <translation>Antevisão - {0}</translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="227"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="232"/> <source>Preview</source> <translation>Antevisão</translation> </message> @@ -44836,521 +45266,501 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/> - <source>Show log</source> - <translation type="unfinished">Mostrar registo</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/> - <source>Show &log</source> - <translation type="unfinished">Mostrar re&gisto</translation> + <source>Show log browser</source> + <translation type="unfinished">Mostrar navegador de registos</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> - <source>Show the log of the local project</source> - <translation type="unfinished">Mostra o registo do projeto local</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="107"/> - <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="114"/> - <source>Show log browser</source> - <translation type="unfinished">Mostrar navegador de registos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="119"/> - <source>Show a dialog to browse the log of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/> <source>Show differences</source> <translation>Mostrar diferenças</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/> <source>Show &difference</source> <translation type="unfinished">Mostrar &diferenças</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="132"/> <source>Show differences (extended)</source> <translation>Mostrar diferenças (extendido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="137"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="140"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/> <source>Show differences (URLs)</source> <translation>Mostrar diferenças (URLs)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="153"/> <source>Show the difference of the project between two repository URLs</source> <translation>Mostrar as diferenças do projeto entre entre duas URLs de repositório</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="156"/> <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/> + <source>Show status</source> + <translation>Mostrar estado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/> + <source>Show &status</source> + <translation>Mostrar e&stado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> + <source>Show the status of the local project</source> + <translation>Mostrar estado do projeto local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="172"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> - <source>Show status</source> - <translation>Mostrar estado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> - <source>Show &status</source> - <translation>Mostrar e&stado</translation> + <source>Show change lists</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/> - <source>Show the status of the local project</source> - <translation>Mostrar estado do projeto local</translation> + <source>Show the change lists and associated files of the local project</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="187"/> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> - <source>Show change lists</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="199"/> - <source>Show the change lists and associated files of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="202"/> <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> <source>Show repository info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="215"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="200"/> <source>Show some repository related information for the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="203"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source>Tag in repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source>&Tag in repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="216"/> + <source>Tag the local project in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> - <source>Tag in repository</source> + <source>Export from repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> - <source>&Tag in repository...</source> - <translation type="unfinished"></translation> + <source>&Export from repository...</source> + <translation>&Exportar do repositório...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="231"/> - <source>Tag the local project in the repository</source> + <source>Export a project from the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished"></translation> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>Exportar do repositorio</b><p>Exporta um projeto do repositorio.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> - <source>Export from repository</source> + <source>Command options</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> - <source>&Export from repository...</source> - <translation>&Exportar do repositório...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="246"/> - <source>Export a project from the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation><b>Exportar do repositorio</b><p>Exporta um projeto do repositorio.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/> - <source>Command options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/> <source>Command &options...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Show the VCS command options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/> + <source>Revert changes</source> + <translation>Desfazer alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/> + <source>Re&vert changes</source> + <translation>&Desfazer alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <source>Revert all changes made to the local project</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/> - <source>Revert changes</source> - <translation>Desfazer alterações</translation> + <source>Merge</source> + <translation>Mesclar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/> - <source>Re&vert changes</source> - <translation>&Desfazer alterações</translation> + <source>Mer&ge changes...</source> + <translation>&Mesclar alterações...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> - <source>Revert all changes made to the local project</source> + <source>Merge changes of a tag/revision into the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/> - <source>Merge</source> - <translation>Mesclar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/> - <source>Mer&ge changes...</source> - <translation>&Mesclar alterações...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="289"/> - <source>Merge changes of a tag/revision into the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/> + <source>Switch</source> + <translation>Mudar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/> + <source>S&witch...</source> + <translation>M&udar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <source>Switch the local copy to another tag/branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>Switch</source> - <translation>Mudar</translation> + <source>Conflicts resolved</source> + <translation>Conflitos resolvidos</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>S&witch...</source> - <translation>M&udar...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> - <source>Switch the local copy to another tag/branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> - <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="304"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="307"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> - <source>Conflicts resolved</source> - <translation>Conflitos resolvidos</translation> + <source>Cleanup</source> + <translation>Limpar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> + <source>Cleanu&p</source> + <translation>Lim&par</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished"></translation> + <source>Cleanup the local project</source> + <translation>Limpar o projeto local</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="322"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/> - <source>Cleanup</source> - <translation>Limpar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/> - <source>Cleanu&p</source> - <translation>Lim&par</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> - <source>Cleanup the local project</source> - <translation>Limpar o projeto local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="337"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Limpar</b><p>Realiza uma limpeza ao projeto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>Execute command</source> <translation>Executar comando</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>E&xecute command...</source> <translation>E&xecutar comando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="333"/> <source>Execute an arbitrary VCS command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="336"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/> <source>List tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/> <source>List tags...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="350"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches</source> <translation>Listar ramos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches...</source> <translation>Listar ramos...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="361"/> <source>List branches of the project</source> <translation>Listar os ramos do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="364"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Listar ramos</b><p>Lista os ramos do projeto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source>List repository contents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source>List repository contents...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="375"/> <source>Lists the contents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/> <source>Set Property</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/> <source>Set Property...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="389"/> <source>Set a property for the project files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="392"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source>List Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source>List Properties...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="403"/> <source>List properties of the project files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/> <source>Delete Property</source> <translation>Apagar Propriedade</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/> <source>Delete Property...</source> <translation>Apagar Propriedade...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> + <source>Delete a property for the project files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="420"/> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/> + <source>Relocate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/> + <source>Relocate...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> - <source>Delete a property for the project files</source> + <source>Relocate the working copy to a new repository URL</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/> - <source>Relocate</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/> - <source>Relocate...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> - <source>Relocate the working copy to a new repository URL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/> <source>Repository Browser</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/> + <source>Repository Browser...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> + <source>Show the Repository Browser dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> - <source>Repository Browser...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="463"/> - <source>Show the Repository Browser dialog</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="466"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <source>Configure</source> + <translation>Configurar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> + <source>Configure...</source> + <translation>Configurar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="462"/> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="465"/> + <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/> - <source>Configure</source> - <translation>Configurar</translation> + <source>Upgrade</source> + <translation>Atualizar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/> - <source>Configure...</source> - <translation>Configurar...</translation> + <source>Upgrade...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="477"/> - <source>Show the configuration dialog with the Subversion page selected</source> + <source>Upgrade the working copy to the current format</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="480"/> - <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/> - <source>Upgrade</source> - <translation>Atualizar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/> - <source>Upgrade...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="492"/> - <source>Upgrade the working copy to the current format</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="495"/> <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="559"/> <source>Subversion (pysvn)</source> <translation>Subversion (pysvn)</translation> </message> @@ -48338,17 +48748,17 @@ <translation>Adicionar...</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="55"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="65"/> <source>Press to remove the selected documents from the database</source> <translation>Pressionar para retirar os documentos selecionados da base de dados</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="58"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="68"/> <source>Remove</source> <translation>Retirar</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="117"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="132"/> <source>Add Documentation</source> <translation>Adicionar Documentação</translation> </message> @@ -48358,40 +48768,50 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="107"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="122"/> <source>The file <b>{0}</b> is not a valid Qt Help File.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="117"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="132"/> <source>The namespace <b>{0}</b> is already registered.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="167"/> + <source>Remove Documentation</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="152"/> - <source>Remove Documentation</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="137"/> <source>Do you really want to remove the selected documentation sets from the database?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="152"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="167"/> <source>Some documents currently opened reference the documentation you are attempting to remove. Removing the documentation will close those documents. Remove anyway?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="78"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="55"/> <source>Press to select QtHelp documents provided by a plug-in to add to the database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="81"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="58"/> <source>Add from Plug-ins...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="85"/> + <source>Select to manage the plug-in provided documentation sets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="88"/> + <source>Manage Plug-ins...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QtHelpDocumentationSelectionDialog</name> @@ -48405,6 +48825,61 @@ <source>Select the documentation files to be installed:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="144"/> + <source>Delete Documentation Sets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="91"/> + <source>Shall the selected documentation sets really be deleted?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="107"/> + <source><p>The documentation set <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="126"/> + <source>Shall the selected documentation set categories really be deleted?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="144"/> + <source>Shall all documentation sets really be deleted?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="56"/> + <source>Press to delete the selected documentation sets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="59"/> + <source>Delete</source> + <translation type="unfinished">Apagar</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="66"/> + <source>Press to delete the selected category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="69"/> + <source>Delete Categories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="76"/> + <source>Press to delete all entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="79"/> + <source>Delete All</source> + <translation type="unfinished">Apagar Tudo</translation> + </message> </context> <context> <name>QtHelpFiltersDialog</name> @@ -49672,6 +50147,19 @@ </message> </context> <context> + <name>RestructuredTextProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/RestructuredTextProvider.py" line="411"/> + <source>Create List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/RestructuredTextProvider.py" line="411"/> + <source>Enter desired number of list elements:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>SafariImporter</name> <message> <location filename="../WebBrowser/Bookmarks/BookmarksImporters/SafariImporter.py" line="44"/> @@ -52696,7 +53184,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1984"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1964"/> <source>The svn process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -52786,137 +53274,127 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/> <source>Subversion Error</source> <translation type="unfinished">Erro de Subversão</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="951"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="998"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="978"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1033"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1013"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1056"/> <source>Reverting changes</source> <translation type="unfinished">Desfazer alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1093"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1073"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1151"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1131"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1196"/> <source>Merging {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1482"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1462"/> <source>Cleaning up {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1512"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1492"/> <source>Subversion command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1684"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1664"/> <source>Resolving conficts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1695"/> <source>Copying {0}</source> <translation type="unfinished">A copiar {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1779"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1759"/> <source>Subversion Set Property</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1781"/> + <source>You have to supply a property name. Aborting.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1801"/> - <source>You have to supply a property name. Aborting.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1821"/> <source>Subversion Delete Property</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1791"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1771"/> <source>Enter property name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> - <source>Subversion Log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> - <source>Select number of entries to show.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2080"/> <source>Locking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2108"/> <source>Unlocking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2153"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2133"/> <source>Relocating</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/> <source>Repository Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/> <source>Enter the repository URL.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2221"/> <source>Remove from changelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/> <source>Add to changelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/> <source>Enter name of the changelist:</source> <translation type="unfinished"></translation> </message> @@ -52932,28 +53410,28 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1255"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1234"/> <source>Revision {0}. </source> <translation>Revisão {0}.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1923"/> <source>Property set.</source> <translation>Propriedade definida.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1997"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1976"/> <source>Property deleted.</source> <translation>Propriedade apagada.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/> <source>Subversion Lock</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/> <source>Enter lock comment</source> <translation type="unfinished"></translation> </message> @@ -53133,37 +53611,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/> <source>Revert changes</source> <translation>Desfazer alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1042"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1987"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1967"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/> <source>Subversion Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>O ficheiro <b>{0}</b> não se pôde ler.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2305"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2285"/> <source>Upgrade</source> <translation>Atualizar</translation> </message> @@ -54044,17 +54522,17 @@ <translation type="unfinished">Selecionar o campo a filtrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="661"/> <source>Revision</source> <translation>Revisão</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="658"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="165"/> <source>Message</source> <translation>Mensagem</translation> </message> @@ -54114,256 +54592,251 @@ <translation type="unfinished">Parar em Copiar/Mover</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="261"/> <source>Press to generate a diff to the previous revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="264"/> <source>&Diff to Previous</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="271"/> + <source>Press to compare two revisions</source> + <translation type="unfinished">Pressionar para comparar duas revisões</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> + <source>&Compare Revisions</source> + <translation type="unfinished">&Comparar Revisões</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="312"/> + <source>Errors</source> + <translation>Erros</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="318"/> + <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="334"/> + <source>Input</source> + <translation>Entrada</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> + <source>Press to send the input to the subversion process</source> + <translation>Pressionar para enviar a entrada ao processo de subversão</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> + <source>&Send</source> + <translation>&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="369"/> + <source>Enter data to be sent to the subversion process</source> + <translation>Introduzir dados para enviar ao processo de subversão</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="376"/> + <source>Select to switch the input field to password mode</source> + <translation>Selecionar para mudar o campo de entrada ao modo senha</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="379"/> + <source>&Password Mode</source> + <translation>Modo &Senha</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="382"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="93"/> + <source>Added</source> + <translation>Adicionado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="94"/> + <source>Deleted</source> + <translation>Apagado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="95"/> + <source>Modified</source> + <translation>Alterado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="527"/> + <source>Subversion Error</source> + <translation>Erro de Subversão</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="313"/> + <source>Process Generation Error</source> + <translation>Erro na Criação de Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="313"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation>Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="96"/> + <source>Replaced</source> + <translation>Substituído</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="294"/> + <source>Select to show differences side-by-side</source> + <translation>Selecionar para mostrar as diferenças lado-a-lado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="297"/> + <source>Show differences side-by-side</source> + <translation>Mostrar diferenças lado-a-lado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> - <source>Press to compare two revisions</source> - <translation type="unfinished">Pressionar para comparar duas revisões</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="254"/> - <source>&Compare Revisions</source> - <translation type="unfinished">&Comparar Revisões</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="292"/> - <source>Errors</source> - <translation>Erros</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="298"/> - <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="314"/> - <source>Input</source> - <translation>Entrada</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="336"/> - <source>Press to send the input to the subversion process</source> - <translation>Pressionar para enviar a entrada ao processo de subversão</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/> - <source>&Send</source> - <translation>&Enviar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="349"/> - <source>Enter data to be sent to the subversion process</source> - <translation>Introduzir dados para enviar ao processo de subversão</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> - <source>Select to switch the input field to password mode</source> - <translation>Selecionar para mudar o campo de entrada ao modo senha</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> - <source>&Password Mode</source> - <translation>Modo &Senha</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="89"/> - <source>Added</source> - <translation>Adicionado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="90"/> - <source>Deleted</source> - <translation>Apagado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="91"/> - <source>Modified</source> - <translation>Alterado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="504"/> - <source>Subversion Error</source> - <translation>Erro de Subversão</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> - <source>Process Generation Error</source> - <translation>Erro na Criação de Processo</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation>Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="92"/> - <source>Replaced</source> - <translation>Substituído</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> - <source>Select to show differences side-by-side</source> - <translation>Selecionar para mostrar as diferenças lado-a-lado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="277"/> - <source>Show differences side-by-side</source> - <translation>Mostrar diferenças lado-a-lado</translation> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> </message> </context> <context> <name>SvnLogDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="14"/> - <source>Subversion Log</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="26"/> <source>Log</source> - <translation type="unfinished">Registo</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="32"/> - <source><b>Subversion Log</b><p>This shows the output of the svn log command. By clicking on the links you may show the difference between versions.</p></source> - <translation type="unfinished"></translation> + <translation type="obsolete">Registo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="58"/> <source>Errors</source> - <translation>Erros</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="64"/> - <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> - <translation type="unfinished"></translation> + <translation type="obsolete">Erros</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="80"/> <source>Input</source> - <translation>Entrada</translation> + <translation type="obsolete">Entrada</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="102"/> <source>Press to send the input to the subversion process</source> - <translation type="unfinished">Pressionar para enviar a entrada ao processo de subversão</translation> + <translation type="obsolete">Pressionar para enviar a entrada ao processo de subversão</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="105"/> <source>&Send</source> - <translation>&Enviar</translation> + <translation type="obsolete">&Enviar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="108"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="115"/> <source>Enter data to be sent to the subversion process</source> - <translation>Introduzir dados para enviar ao processo de subversão</translation> + <translation type="obsolete">Introduzir dados para enviar ao processo de subversão</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="122"/> <source>Select to switch the input field to password mode</source> - <translation>Selecionar para mudar o campo de entrada ao modo senha</translation> + <translation type="obsolete">Selecionar para mudar o campo de entrada ao modo senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="125"/> <source>&Password Mode</source> - <translation>Modo &Senha</translation> + <translation type="obsolete">Modo &Senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="128"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="55"/> <source><b>Processing your request, please wait...</b></source> - <translation><b>A processar a sua solicitude, por favor espere...</b></translation> + <translation type="obsolete"><b>A processar a sua solicitude, por favor espere...</b></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="81"/> <source>Added</source> - <translation>Adicionado</translation> + <translation type="obsolete">Adicionado</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="82"/> <source>Deleted</source> - <translation>Apagado</translation> + <translation type="obsolete">Apagado</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="83"/> <source>Modified</source> - <translation>Alterado</translation> + <translation type="obsolete">Alterado</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="87"/> <source>revision</source> - <translation>revisão</translation> + <translation type="obsolete">revisão</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> <source>Process Generation Error</source> - <translation>Erro na Criação de Processo</translation> + <translation type="obsolete">Erro na Criação de Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation>Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> + <translation type="obsolete">Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="193"/> <source>diff to {0}</source> - <translation>diff a {0}</translation> + <translation type="obsolete">diff a {0}</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="202"/> <source><i>author: {0}</i><br /> </source> - <translation><i>autor: {0}</i><br /> + <translation type="obsolete"><i>autor: {0}</i><br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="205"/> <source><i>date: {0}</i><br /> </source> - <translation><i>data: {0}</i><br /> + <translation type="obsolete"><i>data: {0}</i><br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="191"/> <source> (copied from {0}, revision {1})</source> - <translation> (copied de {0}, revisão {1})</translation> + <translation type="obsolete"> (copied de {0}, revisão {1})</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="42"/> <source>Select to show differences side-by-side</source> - <translation>Selecionar para mostrar as diferenças lado-a-lado</translation> + <translation type="obsolete">Selecionar para mostrar as diferenças lado-a-lado</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="45"/> <source>Show differences side-by-side</source> - <translation>Mostrar diferenças lado-a-lado</translation> + <translation type="obsolete">Mostrar diferenças lado-a-lado</translation> </message> </context> <context> @@ -54662,177 +55135,177 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="634"/> <source>Version Control</source> <translation type="unfinished">Control de Versão</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="654"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="646"/> <source>Update from repository</source> <translation type="unfinished">Atualizar desde o repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="658"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="650"/> <source>Commit changes to repository...</source> <translation type="unfinished">Cometer alterações no repositório...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="656"/> <source>Add to repository</source> <translation type="unfinished">Adicionar ao repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="385"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="381"/> <source>Add tree to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="660"/> <source>Remove from repository (and disk)</source> <translation type="unfinished">Retirar do repositorio (e disco)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="667"/> <source>Add to Changelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="679"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="671"/> <source>Remove from Changelist</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="566"/> <source>Show log</source> - <translation type="unfinished">Mostrar registo</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="570"/> + <translation type="obsolete">Mostrar registo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="562"/> <source>Show log browser</source> <translation type="unfinished">Mostrar navegador de registos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="684"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="676"/> <source>Show status</source> <translation type="unfinished">Mostrar estado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="286"/> <source>Show annotated file</source> <translation type="unfinished">Mostrar ficheiro anotado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="696"/> <source>Revert changes</source> <translation type="unfinished">Desfazer alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="708"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="700"/> <source>Merge changes</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="430"/> + <source>Lock</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="434"/> - <source>Lock</source> + <source>Unlock</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="438"/> - <source>Unlock</source> + <source>Break Lock</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="442"/> - <source>Break Lock</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="446"/> <source>Steal Lock</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="708"/> + <source>Set Property</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="710"/> + <source>List Properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="713"/> + <source>Delete Property</source> + <translation type="unfinished">Apagar Propriedade</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="716"/> - <source>Set Property</source> - <translation type="unfinished"></translation> + <source>Select all local file entries</source> + <translation type="unfinished">Selecionar todas as entradas de ficheiros locais</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="718"/> - <source>List Properties</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="721"/> - <source>Delete Property</source> - <translation type="unfinished">Apagar Propriedade</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="724"/> - <source>Select all local file entries</source> - <translation type="unfinished">Selecionar todas as entradas de ficheiros locais</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="726"/> <source>Select all versioned file entries</source> <translation type="unfinished">Selecionar todas as entradas de ficheiros versionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="720"/> <source>Select all local directory entries</source> <translation type="unfinished">Selecionar todas as entradas de diretorios locais</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="730"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="722"/> <source>Select all versioned directory entries</source> <translation type="unfinished">Selecionar todas as entradas de diretorios versionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="733"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="725"/> <source>Configure...</source> <translation>Configurar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="572"/> <source>Show repository info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="547"/> <source>Copy</source> <translation>Copiar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="549"/> <source>Move</source> <translation type="unfinished">Mover</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="681"/> <source>Show differences</source> <translation type="unfinished">Mostrar diferenças</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="271"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="267"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="693"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="685"/> <source>Show differences (extended)</source> <translation type="unfinished">Mostrar diferenças (extendido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="276"/> <source>Show differences side-by-side (extended)</source> <translation type="unfinished">Selecionar para mostrar as diferenças lado-a-lado (extendido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="698"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="690"/> <source>Show differences (URLs)</source> <translation type="unfinished">Mostrar diferenças (URLs)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="712"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/> <source>Conflicts resolved</source> <translation type="unfinished">Conflitos resolvidos</translation> </message> @@ -54901,506 +55374,486 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/> - <source>Show log</source> - <translation type="unfinished">Mostrar registo</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/> - <source>Show &log</source> - <translation type="unfinished">Mostrar re&gisto</translation> + <source>Show log browser</source> + <translation type="unfinished">Mostrar navegador de registos</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="104"/> - <source>Show the log of the local project</source> - <translation type="unfinished">Mostra o registo do projeto local</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="107"/> - <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="114"/> - <source>Show log browser</source> - <translation type="unfinished">Mostrar navegador de registos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="119"/> - <source>Show a dialog to browse the log of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="122"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/> <source>Show &difference</source> <translation type="unfinished">Mostrar &diferenças</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="121"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="137"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="153"/> <source>Show the difference of the project between two repository URLs</source> <translation type="unfinished">Mostrar as diferenças do projeto entre entre duas URLs de repositório</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="164"/> <source>Show status</source> <translation type="unfinished">Mostrar estado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="164"/> <source>Show &status</source> <translation type="unfinished">Mostrar e&stado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="169"/> <source>Show the status of the local project</source> <translation type="unfinished">Mostrar estado do projeto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="172"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="195"/> + <source>Tag in repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="195"/> + <source>&Tag in repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="200"/> + <source>Tag the local project in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="203"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="210"/> - <source>Tag in repository</source> + <source>Export from repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="210"/> - <source>&Tag in repository...</source> - <translation type="unfinished"></translation> + <source>&Export from repository...</source> + <translation type="unfinished">&Exportar do repositório...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="215"/> - <source>Tag the local project in the repository</source> + <source>Export a project from the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="218"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished"></translation> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation type="unfinished"><b>Exportar do repositorio</b><p>Exporta um projeto do repositorio.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/> - <source>Export from repository</source> + <source>Command options</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/> - <source>&Export from repository...</source> - <translation type="unfinished">&Exportar do repositório...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="230"/> - <source>Export a project from the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="233"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation type="unfinished"><b>Exportar do repositorio</b><p>Exporta um projeto do repositorio.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="240"/> - <source>Command options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="240"/> <source>Command &options...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="229"/> <source>Show the VCS command options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="231"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="238"/> + <source>Revert changes</source> + <translation type="unfinished">Desfazer alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="238"/> + <source>Re&vert changes</source> + <translation type="unfinished">&Desfazer alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="243"/> + <source>Revert all changes made to the local project</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="246"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/> - <source>Revert changes</source> - <translation type="unfinished">Desfazer alterações</translation> + <source>Merge</source> + <translation type="unfinished">Mesclar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/> - <source>Re&vert changes</source> - <translation type="unfinished">&Desfazer alterações</translation> + <source>Mer&ge changes...</source> + <translation type="unfinished">&Mesclar alterações...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="258"/> - <source>Revert all changes made to the local project</source> + <source>Merge changes of a tag/revision into the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="261"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="268"/> - <source>Merge</source> - <translation type="unfinished">Mesclar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="268"/> - <source>Mer&ge changes...</source> - <translation type="unfinished">&Mesclar alterações...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="273"/> - <source>Merge changes of a tag/revision into the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="276"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="269"/> + <source>Switch</source> + <translation type="unfinished">Mudar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="269"/> + <source>S&witch...</source> + <translation type="unfinished">M&udar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="274"/> + <source>Switch the local copy to another tag/branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="277"/> + <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> + <source>Cleanup</source> + <translation type="unfinished">Limpar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> + <source>Cleanu&p</source> + <translation type="unfinished">Lim&par</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="303"/> + <source>Cleanup the local project</source> + <translation type="unfinished">Limpar o projeto local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="306"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation type="unfinished"><b>Limpar</b><p>Realiza uma limpeza ao projeto local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="313"/> + <source>Execute command</source> + <translation type="unfinished">Executar comando</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="313"/> + <source>E&xecute command...</source> + <translation type="unfinished">E&xecutar comando...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="317"/> + <source>Execute an arbitrary VCS command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="320"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="327"/> + <source>List tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="327"/> + <source>List tags...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="331"/> + <source>List tags of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="334"/> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="341"/> + <source>List branches</source> + <translation type="unfinished">Listar ramos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="341"/> + <source>List branches...</source> + <translation type="unfinished">Listar ramos...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="345"/> + <source>List branches of the project</source> + <translation type="unfinished">Listar os ramos do projeto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="348"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation type="unfinished"><b>Listar ramos</b><p>Lista os ramos do projeto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="355"/> + <source>List repository contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="355"/> + <source>List repository contents...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="359"/> + <source>Lists the contents of the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="362"/> + <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="369"/> + <source>Set Property</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="369"/> + <source>Set Property...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="373"/> + <source>Set a property for the project files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="376"/> + <source><b>Set Property</b><p>This sets a property for the project files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="383"/> + <source>List Properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="383"/> + <source>List Properties...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="387"/> + <source>List properties of the project files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="390"/> + <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="397"/> + <source>Delete Property</source> + <translation type="unfinished">Apagar Propriedade</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="397"/> + <source>Delete Property...</source> + <translation type="unfinished">Apagar Propriedade...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="401"/> + <source>Delete a property for the project files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="404"/> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/> + <source>Relocate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/> + <source>Relocate...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="416"/> + <source>Relocate the working copy to a new repository URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="419"/> + <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="427"/> + <source>Repository Browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="427"/> + <source>Repository Browser...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="432"/> + <source>Show the Repository Browser dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="435"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> + <source>Configure</source> + <translation type="unfinished">Configurar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> + <source>Configure...</source> + <translation>Configurar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="446"/> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="449"/> + <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> - <source>Switch</source> - <translation type="unfinished">Mudar</translation> + <source>Conflicts resolved</source> + <translation type="unfinished">Conflitos resolvidos</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> - <source>S&witch...</source> - <translation type="unfinished">M&udar...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="289"/> - <source>Switch the local copy to another tag/branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="292"/> - <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="314"/> - <source>Cleanup</source> - <translation type="unfinished">Limpar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="314"/> - <source>Cleanu&p</source> - <translation type="unfinished">Lim&par</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="318"/> - <source>Cleanup the local project</source> - <translation type="unfinished">Limpar o projeto local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="321"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation type="unfinished"><b>Limpar</b><p>Realiza uma limpeza ao projeto local.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="328"/> - <source>Execute command</source> - <translation type="unfinished">Executar comando</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="328"/> - <source>E&xecute command...</source> - <translation type="unfinished">E&xecutar comando...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="332"/> - <source>Execute an arbitrary VCS command</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="335"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="342"/> - <source>List tags</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="342"/> - <source>List tags...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="346"/> - <source>List tags of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="349"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="356"/> - <source>List branches</source> - <translation type="unfinished">Listar ramos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="356"/> - <source>List branches...</source> - <translation type="unfinished">Listar ramos...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="360"/> - <source>List branches of the project</source> - <translation type="unfinished">Listar os ramos do projeto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="363"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation type="unfinished"><b>Listar ramos</b><p>Lista os ramos do projeto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="370"/> - <source>List repository contents</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="370"/> - <source>List repository contents...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="374"/> - <source>Lists the contents of the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="377"/> - <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="384"/> - <source>Set Property</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="384"/> - <source>Set Property...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="388"/> - <source>Set a property for the project files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="391"/> - <source><b>Set Property</b><p>This sets a property for the project files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="398"/> - <source>List Properties</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="398"/> - <source>List Properties...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="402"/> - <source>List properties of the project files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="405"/> - <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="412"/> - <source>Delete Property</source> - <translation type="unfinished">Apagar Propriedade</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="412"/> - <source>Delete Property...</source> - <translation type="unfinished">Apagar Propriedade...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="416"/> - <source>Delete a property for the project files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="419"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="426"/> - <source>Relocate</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="426"/> - <source>Relocate...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="431"/> - <source>Relocate the working copy to a new repository URL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="434"/> - <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> - <source>Repository Browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> - <source>Repository Browser...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="447"/> - <source>Show the Repository Browser dialog</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="450"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="288"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="291"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <source>Show change lists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="184"/> + <source>Show the change lists and associated files of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="187"/> + <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> - <source>Configure</source> - <translation type="unfinished">Configurar</translation> + <source>Upgrade</source> + <translation type="unfinished">Atualizar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> - <source>Configure...</source> - <translation>Configurar...</translation> + <source>Upgrade...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="461"/> - <source>Show the configuration dialog with the Subversion page selected</source> + <source>Upgrade the working copy to the current format</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="464"/> - <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> - <source>Conflicts resolved</source> - <translation type="unfinished">Conflitos resolvidos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="303"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="306"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="194"/> - <source>Show change lists</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="199"/> - <source>Show the change lists and associated files of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="202"/> - <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="472"/> - <source>Upgrade</source> - <translation type="unfinished">Atualizar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="472"/> - <source>Upgrade...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="476"/> - <source>Upgrade the working copy to the current format</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="479"/> <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/> <source>Show differences</source> <translation type="unfinished">Mostrar diferenças</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="124"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="132"/> <source>Show differences (extended)</source> <translation type="unfinished">Mostrar diferenças (extendido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="140"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="148"/> <source>Show differences (URLs)</source> <translation type="unfinished">Mostrar diferenças (URLs)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="156"/> <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="559"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="543"/> <source>Subversion (svn)</source> <translation type="unfinished">Subversion (pysvn)</translation> </message> @@ -59669,22 +60122,22 @@ <translation>Tudo</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="66"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="62"/> <source>Language:</source> <translation>Linguagem:</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="70"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="69"/> <source>GROUP</source> <translation>GRUPO</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="103"/> <source>Close dialog</source> <translation>Fechar caixa de diálogo</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="103"/> <source>Do you really want to close the dialog?</source> <translation>Tem a certeza de que quer fechar a caixa de diálogo?</translation> </message> @@ -61424,7 +61877,7 @@ <context> <name>UnittestDialog</name> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.py" line="403"/> <source>Unittest</source> <translation>Teste Unitário</translation> </message> @@ -61615,57 +62068,57 @@ <translation>^Erro:</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="202"/> + <location filename="../PyUnit/UnittestDialog.py" line="205"/> <source>Python3 Files ({1});;Python2 Files ({0});;All Files (*)</source> <translation>Ficheiros Python3 ({1});;Ficheiros Python2 ({0});;Ficheiros Todos (*)</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="206"/> + <location filename="../PyUnit/UnittestDialog.py" line="209"/> <source>Python Files (*.py);;All Files (*)</source> <translation>Ficheiros Python (*.py);;Ficheiros Todos (*)</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="266"/> + <location filename="../PyUnit/UnittestDialog.py" line="269"/> <source>You must enter a test suite file.</source> <translation>Deve introduzir um ficheiro de suite de testes.</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="274"/> + <location filename="../PyUnit/UnittestDialog.py" line="277"/> <source>Preparing Testsuite</source> <translation>A preparar Suite de Testes</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.py" line="403"/> <source><p>Unable to run test <b>{0}</b>.<br>{1}<br>{2}</p></source> <translation><p>Incapaz de executar teste <b>{0}</b>.<br>{1}<br>{2}</p></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="469"/> + <location filename="../PyUnit/UnittestDialog.py" line="475"/> <source>Running</source> <translation>A executar</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="493"/> + <location filename="../PyUnit/UnittestDialog.py" line="499"/> <source>Ran {0} test in {1:.3f}s</source> <translation>Executado {0} teste em {1:.3f}s</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="497"/> + <location filename="../PyUnit/UnittestDialog.py" line="503"/> <source>Ran {0} tests in {1:.3f}s</source> <translation>Executados {0} testes em {1:.3f}s</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="514"/> + <location filename="../PyUnit/UnittestDialog.py" line="520"/> <source>Failure: {0}</source> <translation>Falho: {0}</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="529"/> + <location filename="../PyUnit/UnittestDialog.py" line="535"/> <source>Error: {0}</source> <translation>Erro: {0}</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="634"/> + <location filename="../PyUnit/UnittestDialog.py" line="640"/> <source>Show Source</source> <translation>Mostrar Fonte</translation> </message> @@ -61700,17 +62153,17 @@ <translation>Número de testes com êxito imprevistos</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="544"/> + <location filename="../PyUnit/UnittestDialog.py" line="550"/> <source> Skipped: {0}</source> <translation> Saltado: {0}</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="559"/> + <location filename="../PyUnit/UnittestDialog.py" line="565"/> <source> Expected Failure</source> <translation> Falhos esperados</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="573"/> + <location filename="../PyUnit/UnittestDialog.py" line="579"/> <source> Unexpected Success</source> <translation> Sucessos Inesperados</translation> </message> @@ -64090,7 +64543,7 @@ <context> <name>Utilities</name> <message> - <location filename="../Utilities/__init__.py" line="1400"/> + <location filename="../Utilities/__init__.py" line="1403"/> <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>Pode usar códigos % como espaços reservados dentro da string. Os códigos suportados são:<table><tr><td>%C</td><td>coluna do cursor do editor atual</td></tr><tr><td>%D</td><td>directório do editor atual</td></tr><tr><td>%F</td><td>nome do ficheiro do editor atual</td></tr><tr><td>%H</td><td>diretório home do usuário atual</td></tr><tr><td>%L</td><td>linha do cursor do editor atual</td></tr><tr><td>%P</td><td>rota do projeto atual</td></tr><tr><td>%S</td><td>texto selecionado do editor atual</td></tr><tr><td>%U</td><td>nome de usuário do usuário atual</td></tr><tr><td>%%</td><td>sinal de percentagem</td></tr></table></p></translation> </message> @@ -64309,13 +64762,13 @@ </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="38"/> - <source>&Locals Filter</source> - <translation>Filtro de &Locais</translation> + <source>&Locals Viewer</source> + <translation type="unfinished">Filtro de &Locais</translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="48"/> - <source>&Globals Filter</source> - <translation>Filtro de &Globais</translation> + <source>&Globals Viewer</source> + <translation type="unfinished">Filtro de &Globais</translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="58"/> @@ -64325,7 +64778,7 @@ <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="61"/> <source><b>Locals Filter List</b> -<p>Select the variable types you want to be filtered out of the locals variables list.</p<</source> +<p>Select the variable types you want to be shown in the local variables viewer.</p<</source> <translation type="unfinished"></translation> </message> <message> @@ -64336,7 +64789,7 @@ <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="81"/> <source><b>Globals Filter List</b> -<p>Select the variable types you want to be filtered out of the globals variables list.</p<</source> +<p>Select the variable types you want to be shown in the global variables viewer.</p<</source> <translation type="unfinished"></translation> </message> <message> @@ -64344,6 +64797,11 @@ <source>Save Default</source> <translation>Gravar Padrão</translation> </message> + <message> + <location filename="../Debugger/VariablesFilterDialog.ui" line="28"/> + <source>Select the variable types to be shown in the variables viewers:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VariablesViewer</name> @@ -64906,7 +65364,7 @@ <translation>Atualizar</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="532"/> + <location filename="../VCS/ProjectHelper.py" line="533"/> <source>The project should be reread. Do this now?</source> <translation>O projecto deve ser recarregado. Fazer-lo agora?</translation> </message> @@ -64921,7 +65379,7 @@ <translation>Tem a certeza de que quer retirar este projeto do repositório (e disco)?</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="532"/> + <location filename="../VCS/ProjectHelper.py" line="533"/> <source>Switch</source> <translation>Mudar</translation> </message> @@ -65001,17 +65459,17 @@ <context> <name>VersionControl</name> <message> - <location filename="../VCS/VersionControl.py" line="573"/> + <location filename="../VCS/VersionControl.py" line="563"/> <source>Process Generation Error</source> <translation>Erro na Criação de Processo</translation> </message> <message> - <location filename="../VCS/VersionControl.py" line="573"/> + <location filename="../VCS/VersionControl.py" line="563"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> <message> - <location filename="../VCS/VersionControl.py" line="704"/> + <location filename="../VCS/VersionControl.py" line="694"/> <source>Repository status checking is switched off</source> <translation>A verificação de estado do repositório está desligada</translation> </message> @@ -72252,24 +72710,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1459"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1426"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Pai #{0}</b></td><td></td></tr> <tr><td><b>Conjunto de Alterações</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiquetas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Ramos</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1446"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -72278,24 +72736,24 @@ <tr><td><b>Hora do Cometido</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Dica</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Conjunto de Alterações</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Pais</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -72306,12 +72764,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -72328,13 +72786,13 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2078"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2083"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> @@ -73019,50 +73477,55 @@ <translation type="unfinished">não comparar tipos, usar 'isinstance()'</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="240"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="243"/> <source>do not assign a lambda expression, use a def</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="243"/> - <source>ambiguous variable name '{0}'</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="246"/> - <source>ambiguous class definition '{0}'</source> + <source>ambiguous variable name '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="249"/> - <source>ambiguous function definition '{0}'</source> + <source>ambiguous class definition '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="252"/> - <source>{0}: {1}</source> - <translation type="unfinished">{0}: {1}</translation> + <source>ambiguous function definition '{0}'</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="255"/> + <source>{0}: {1}</source> + <translation type="unfinished">{0}: {1}</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="258"/> <source>{0}</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="240"/> + <source>do not use bare except</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>subversion</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1606"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1586"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1741"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1720"/> <source>unknown</source> <translation>desconhecido</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1746"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1725"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation type="unfinished"></translation> </message>
diff -r 852016bbdedb -r c307358a2ecc i18n/eric6_ru.ts --- a/i18n/eric6_ru.ts Fri Jan 27 19:18:52 2017 +0100 +++ b/i18n/eric6_ru.ts Fri Feb 03 19:20:59 2017 +0100 @@ -390,7 +390,7 @@ <context> <name>AddBookmarkDialog</name> <message> - <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="198"/> + <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.ui" line="26"/> <source>Add Bookmark</source> <translation>Добавить закладку</translation> </message> @@ -1700,7 +1700,7 @@ <translation>Удалить выбранные элементы</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/> <source>&Delete</source> <translation>&Удалить</translation> </message> @@ -2423,12 +2423,12 @@ <translation>Сохранить трассировку вызовов как текстовый файл</translation> </message> <message> - <location filename="../Debugger/CallTraceViewer.py" line="54"/> + <location filename="../Debugger/CallTraceViewer.ui" line="109"/> <source>From</source> <translation>От</translation> </message> <message> - <location filename="../Debugger/CallTraceViewer.py" line="54"/> + <location filename="../Debugger/CallTraceViewer.ui" line="114"/> <source>To</source> <translation>До</translation> </message> @@ -2536,7 +2536,7 @@ <translation>Очистить список хостов</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="513"/> + <location filename="../Cooperation/ChatWidget.ui" line="230"/> <source>Clear</source> <translation>Очистить</translation> </message> @@ -2894,7 +2894,7 @@ <context> <name>ClickToFlashWhitelistDialog</name> <message> - <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="54"/> + <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="14"/> <source>ClickToFlash Whitelist</source> <translation>Белый список ClickToFlash</translation> </message> @@ -3519,147 +3519,147 @@ <context> <name>CodeStyleFixer</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="494"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> <source>Triple single quotes converted to triple double quotes.</source> <translation>Тройные одинарные кавычки заменены тройными двойными.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> - <source>Introductory quotes corrected to be {0}"""</source> - <translation>Кавычки во введении исправлены на {0}"""</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="500"/> - <source>Single line docstring put on one line.</source> - <translation>Одиночная строка документации распологается в одной строке.</translation> + <source>Introductory quotes corrected to be {0}"""</source> + <translation>Кавычки во введении исправлены на {0}"""</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="503"/> + <source>Single line docstring put on one line.</source> + <translation>Одиночная строка документации распологается в одной строке.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="506"/> <source>Period added to summary line.</source> <translation>Добавлена точка в строке резюме.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> <source>Blank line before function/method docstring removed.</source> <translation>Удалена пустая строка перед строкой документации для function/method.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="509"/> - <source>Blank line inserted before class docstring.</source> - <translation>Добавлена пустая строка перед строкой документации для class.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="512"/> - <source>Blank line inserted after class docstring.</source> - <translation>Добавлена пустая строка после строки документации для class.</translation> + <source>Blank line inserted before class docstring.</source> + <translation>Добавлена пустая строка перед строкой документации для class.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="515"/> - <source>Blank line inserted after docstring summary.</source> - <translation>Добавлена пустая строка после резюме строки документации.</translation> + <source>Blank line inserted after class docstring.</source> + <translation>Добавлена пустая строка после строки документации для class.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="518"/> - <source>Blank line inserted after last paragraph of docstring.</source> - <translation>Добавлена пустая строка после последнего абзаца строки документации.</translation> + <source>Blank line inserted after docstring summary.</source> + <translation>Добавлена пустая строка после резюме строки документации.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="521"/> - <source>Leading quotes put on separate line.</source> - <translation>Открывающие кавычки размещены на отдельной строке.</translation> + <source>Blank line inserted after last paragraph of docstring.</source> + <translation>Добавлена пустая строка после последнего абзаца строки документации.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="524"/> - <source>Trailing quotes put on separate line.</source> - <translation>Закрывающие кавычки размещены на отдельной строке.</translation> + <source>Leading quotes put on separate line.</source> + <translation>Открывающие кавычки размещены на отдельной строке.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="527"/> + <source>Trailing quotes put on separate line.</source> + <translation>Закрывающие кавычки размещены на отдельной строке.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> <source>Blank line before class docstring removed.</source> <translation>Удалена пустая строка перед строкой документации для class.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> - <source>Blank line after class docstring removed.</source> - <translation>Удалена пустая строка после строки документации для class.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="536"/> - <source>Blank line after function/method docstring removed.</source> - <translation>Удалена пустая строка после строки документации для function/method.</translation> + <source>Blank line after class docstring removed.</source> + <translation>Удалена пустая строка после строки документации для class.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="539"/> - <source>Blank line after last paragraph removed.</source> - <translation>Удалена пустая строка после последнего абзаца.</translation> + <source>Blank line after function/method docstring removed.</source> + <translation>Удалена пустая строка после строки документации для function/method.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="542"/> - <source>Tab converted to 4 spaces.</source> - <translation>Символы табуляции заменяются на 4 пробела.</translation> + <source>Blank line after last paragraph removed.</source> + <translation>Удалена пустая строка после последнего абзаца.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="545"/> - <source>Indentation adjusted to be a multiple of four.</source> - <translation>Величина отступа сделана кратной четырём.</translation> + <source>Tab converted to 4 spaces.</source> + <translation>Символы табуляции заменяются на 4 пробела.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="548"/> - <source>Indentation of continuation line corrected.</source> - <translation>Исправлен размер отступа строки продолжения.</translation> + <source>Indentation adjusted to be a multiple of four.</source> + <translation>Величина отступа сделана кратной четырём.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="551"/> - <source>Indentation of closing bracket corrected.</source> - <translation>Исправлен размер отступа закрывающей скобки.</translation> + <source>Indentation of continuation line corrected.</source> + <translation>Исправлен размер отступа строки продолжения.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="554"/> - <source>Missing indentation of continuation line corrected.</source> - <translation>Добавлен отступ к строке продолжения.</translation> + <source>Indentation of closing bracket corrected.</source> + <translation>Исправлен размер отступа закрывающей скобки.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="557"/> - <source>Closing bracket aligned to opening bracket.</source> - <translation>Закрывающая скобка выровнена с открывающей.</translation> + <source>Missing indentation of continuation line corrected.</source> + <translation>Добавлен отступ к строке продолжения.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="560"/> - <source>Indentation level changed.</source> - <translation>Изменен размер отступа.</translation> + <source>Closing bracket aligned to opening bracket.</source> + <translation>Закрывающая скобка выровнена с открывающей.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="563"/> - <source>Indentation level of hanging indentation changed.</source> - <translation>Изменен размер отступа для висячих отступов.</translation> + <source>Indentation level changed.</source> + <translation>Изменен размер отступа.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="566"/> + <source>Indentation level of hanging indentation changed.</source> + <translation>Изменен размер отступа для висячих отступов.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="569"/> <source>Visual indentation corrected.</source> <translation>Исправленена величина визуального отступа.</translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="584"/> + <source>Extraneous whitespace removed.</source> + <translation>Лишние символы пропуска удалены.</translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="581"/> - <source>Extraneous whitespace removed.</source> - <translation>Лишние символы пропуска удалены.</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="578"/> <source>Missing whitespace added.</source> <translation>Добавлены недостающие символы пропуска.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="584"/> - <source>Whitespace around comment sign corrected.</source> - <translation>Символы пропуска вокруг символа комментария откорректированы.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="587"/> + <source>Whitespace around comment sign corrected.</source> + <translation>Символы пропуска вокруг символа комментария откорректированы.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="590"/> <source>One blank line inserted.</source> <translation>Добавлена одна пустая строка.</translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="591"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> <source>%n blank line(s) inserted.</source> <translation> <numerusform>%n пустая строка вставлена.</numerusform> @@ -3668,7 +3668,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="597"/> <source>%n superfluous lines removed</source> <translation> <numerusform>%n лишняя пустая строка удалена</numerusform> @@ -3677,77 +3677,77 @@ </translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="598"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="601"/> <source>Superfluous blank lines removed.</source> <translation>Удалены излишние пустые строки.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="601"/> - <source>Superfluous blank lines after function decorator removed.</source> - <translation>Удалены пустые строки после декоратора функции.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="604"/> - <source>Imports were put on separate lines.</source> - <translation>Операторы импорта помещены на отдельных строках.</translation> + <source>Superfluous blank lines after function decorator removed.</source> + <translation>Удалены пустые строки после декоратора функции.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="607"/> - <source>Long lines have been shortened.</source> - <translation>Укорочены длинные строки.</translation> + <source>Imports were put on separate lines.</source> + <translation>Операторы импорта помещены на отдельных строках.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="610"/> + <source>Long lines have been shortened.</source> + <translation>Укорочены длинные строки.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="613"/> <source>Redundant backslash in brackets removed.</source> <translation>Удалены излишние символы '\'.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="616"/> - <source>Compound statement corrected.</source> - <translation>Исправлены составные выражения.</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="619"/> - <source>Comparison to None/True/False corrected.</source> - <translation>Исправлено сравнение с None/True/False.</translation> + <source>Compound statement corrected.</source> + <translation>Исправлены составные выражения.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="622"/> - <source>'{0}' argument added.</source> - <translation>Добавлен '{0}' аргумент.</translation> + <source>Comparison to None/True/False corrected.</source> + <translation>Исправлено сравнение с None/True/False.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="625"/> - <source>'{0}' argument removed.</source> - <translation>Удалён '{0}' аргумент.</translation> + <source>'{0}' argument added.</source> + <translation>Добавлен '{0}' аргумент.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="628"/> - <source>Whitespace stripped from end of line.</source> - <translation>Завершающие символы пропуска обрезаны.</translation> + <source>'{0}' argument removed.</source> + <translation>Удалён '{0}' аргумент.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="631"/> - <source>newline added to end of file.</source> - <translation>Символ новой строки добавлен в конец файла.</translation> + <source>Whitespace stripped from end of line.</source> + <translation>Завершающие символы пропуска обрезаны.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="634"/> - <source>Superfluous trailing blank lines removed from end of file.</source> - <translation>Удалены пустые строки в конце файла.</translation> + <source>newline added to end of file.</source> + <translation>Символ новой строки добавлен в конец файла.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="637"/> + <source>Superfluous trailing blank lines removed from end of file.</source> + <translation>Удалены пустые строки в конце файла.</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="640"/> <source>'<>' replaced by '!='.</source> <translation>'<>' заменен на '!='.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="641"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="644"/> <source>Could not save the file! Skipping it. Reason: {0}</source> <translation>Не удалось сохранить файл! Пропускаем. Причина: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="710"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="713"/> <source> no message defined for code '{0}'</source> <translation>нет сообщения, определенного для кода '{0}'</translation> </message> @@ -4826,7 +4826,7 @@ <translation>Домен:</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/> <source><no cookie selected></source> <translation><куки не выбраны></translation> </message> @@ -7042,197 +7042,197 @@ <context> <name>DocStyleChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="260"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="263"/> <source>module is missing a docstring</source> <translation>в модуле отсутствует строка документации</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="262"/> - <source>public function/method is missing a docstring</source> - <translation>для public function/method отсутствует строка документации</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="265"/> - <source>private function/method may be missing a docstring</source> - <translation>для private function/method возможно отсутствует строка документации</translation> + <source>public function/method is missing a docstring</source> + <translation>для public function/method отсутствует строка документации</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="268"/> + <source>private function/method may be missing a docstring</source> + <translation>для private function/method возможно отсутствует строка документации</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="271"/> <source>public class is missing a docstring</source> <translation>для public class отсутствует строка документации</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="270"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="273"/> <source>private class may be missing a docstring</source> <translation>для private class возможно отсутствует строка документации</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="272"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="275"/> <source>docstring not surrounded by """</source> <translation>строка документации не заключена в """</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="274"/> - <source>docstring containing \ not surrounded by r"""</source> - <translation>строка документации содержит \ не заключеный в r"""</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="277"/> - <source>docstring containing unicode character not surrounded by u"""</source> - <translation>строка документации содержит unicode-символ не заключенный в u"""</translation> + <source>docstring containing \ not surrounded by r"""</source> + <translation>строка документации содержит \ не заключеный в r"""</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="280"/> + <source>docstring containing unicode character not surrounded by u"""</source> + <translation>строка документации содержит unicode-символ не заключенный в u"""</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="283"/> <source>one-liner docstring on multiple lines</source> <translation>однострочная строка документации размещается на нескольких строках</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="282"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="285"/> <source>docstring has wrong indentation</source> <translation>строка документации с неправильным отступом</translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="328"/> + <source>docstring summary does not end with a period</source> + <translation>резюме строки документации не заканчивается точкой</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="291"/> + <source>docstring summary is not in imperative mood (Does instead of Do)</source> + <translation>резюме строки документации не в повелительном наклонении</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="295"/> + <source>docstring summary looks like a function's/method's signature</source> + <translation>резюме строки документации выглядит как описание функции</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="298"/> + <source>docstring does not mention the return value type</source> + <translation>строка документации не описывает тип возвращаемого значения</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="301"/> + <source>function/method docstring is separated by a blank line</source> + <translation>строка документации для function/method разделена пустыми строками</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="304"/> + <source>class docstring is not preceded by a blank line</source> + <translation>строка документации для class не предваряется пустой строкой</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="307"/> + <source>class docstring is not followed by a blank line</source> + <translation>строка документации для class не завершается пустой строкой</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="362"/> + <source>docstring summary is not followed by a blank line</source> + <translation>резюме строки документации не завершается пустой строкой</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="313"/> + <source>last paragraph of docstring is not followed by a blank line</source> + <translation>отсутствует пустая строка после последнего абзаца строки документации</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="317"/> + <source>private function/method is missing a docstring</source> + <translation>для private function/method отсутствует строка документации</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="320"/> + <source>private class is missing a docstring</source> + <translation>для private class отсутствует строка документации</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="322"/> + <source>leading quotes of docstring not on separate line</source> + <translation>открывающие кавычки строки документации размещены не в отдельной строке</translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="325"/> - <source>docstring summary does not end with a period</source> - <translation>резюме строки документации не заканчивается точкой</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="288"/> - <source>docstring summary is not in imperative mood (Does instead of Do)</source> - <translation>резюме строки документации не в повелительном наклонении</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="292"/> - <source>docstring summary looks like a function's/method's signature</source> - <translation>резюме строки документации выглядит как описание функции</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="295"/> - <source>docstring does not mention the return value type</source> - <translation>строка документации не описывает тип возвращаемого значения</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="298"/> - <source>function/method docstring is separated by a blank line</source> - <translation>строка документации для function/method разделена пустыми строками</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="301"/> - <source>class docstring is not preceded by a blank line</source> - <translation>строка документации для class не предваряется пустой строкой</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="304"/> - <source>class docstring is not followed by a blank line</source> - <translation>строка документации для class не завершается пустой строкой</translation> + <source>trailing quotes of docstring not on separate line</source> + <translation>закрывающие кавычки строки документации размещены не в отдельной строке</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="332"/> + <source>docstring does not contain a @return line but function/method returns something</source> + <translation>строка документации не содержит строчки @return, но function/method что-то возвращает</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="336"/> + <source>docstring contains a @return line but function/method doesn't return anything</source> + <translation>строка документации содержит строчку @return, но function/method ничего не возвращает</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="340"/> + <source>docstring does not contain enough @param/@keyparam lines</source> + <translation>в строке документации недостаточно строк с @param/@keyparam</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="343"/> + <source>docstring contains too many @param/@keyparam lines</source> + <translation>в строке документации слишком много строк с @param/@keyparam</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="346"/> + <source>keyword only arguments must be documented with @keyparam lines</source> + <translation>только аргументы клюсевого слова должны быть описаны с помощью строк @keyparam</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="349"/> + <source>order of @param/@keyparam lines does not match the function/method signature</source> + <translation>порядок следования строк @param/@keyparam не соответствует сигнатуре функции</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="352"/> + <source>class docstring is preceded by a blank line</source> + <translation>строке документации class предшествует пустая строка</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="354"/> + <source>class docstring is followed by a blank line</source> + <translation>за строкой документации для class следует пустая строка</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="356"/> + <source>function/method docstring is preceded by a blank line</source> + <translation>строке документации для function/method предшествует пустая строка</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="359"/> - <source>docstring summary is not followed by a blank line</source> - <translation>резюме строки документации не завершается пустой строкой</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="310"/> - <source>last paragraph of docstring is not followed by a blank line</source> - <translation>отсутствует пустая строка после последнего абзаца строки документации</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="314"/> - <source>private function/method is missing a docstring</source> - <translation>для private function/method отсутствует строка документации</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="317"/> - <source>private class is missing a docstring</source> - <translation>для private class отсутствует строка документации</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="319"/> - <source>leading quotes of docstring not on separate line</source> - <translation>открывающие кавычки строки документации размещены не в отдельной строке</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="322"/> - <source>trailing quotes of docstring not on separate line</source> - <translation>закрывающие кавычки строки документации размещены не в отдельной строке</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="329"/> - <source>docstring does not contain a @return line but function/method returns something</source> - <translation>строка документации не содержит строчки @return, но function/method что-то возвращает</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="333"/> - <source>docstring contains a @return line but function/method doesn't return anything</source> - <translation>строка документации содержит строчку @return, но function/method ничего не возвращает</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="337"/> - <source>docstring does not contain enough @param/@keyparam lines</source> - <translation>в строке документации недостаточно строк с @param/@keyparam</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="340"/> - <source>docstring contains too many @param/@keyparam lines</source> - <translation>в строке документации слишком много строк с @param/@keyparam</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="343"/> - <source>keyword only arguments must be documented with @keyparam lines</source> - <translation>только аргументы клюсевого слова должны быть описаны с помощью строк @keyparam</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="346"/> - <source>order of @param/@keyparam lines does not match the function/method signature</source> - <translation>порядок следования строк @param/@keyparam не соответствует сигнатуре функции</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="349"/> - <source>class docstring is preceded by a blank line</source> - <translation>строке документации class предшествует пустая строка</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="351"/> - <source>class docstring is followed by a blank line</source> - <translation>за строкой документации для class следует пустая строка</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="353"/> - <source>function/method docstring is preceded by a blank line</source> - <translation>строке документации для function/method предшествует пустая строка</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="356"/> <source>function/method docstring is followed by a blank line</source> <translation>за строкой документации для function/method следует пустая строка</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="362"/> - <source>last paragraph of docstring is followed by a blank line</source> - <translation>за последним абзацем строки документации следует пустая строка</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="365"/> + <source>last paragraph of docstring is followed by a blank line</source> + <translation>за последним абзацем строки документации следует пустая строка</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="368"/> <source>docstring does not contain a @exception line but function/method raises an exception</source> <translation>строка документации не содержит @exception, но function/method вызывает исключение</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="369"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="372"/> <source>docstring contains a @exception line but function/method doesn't raise an exception</source> <translation>строка документации содержит @exception, но function/method не вызывает исключение</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="374"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="377"/> <source>{0}: {1}</source> <translation>{0}: {1}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="284"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="287"/> <source>docstring does not contain a summary</source> <translation>строка документации не содержит резюме</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="327"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="330"/> <source>docstring summary does not start with '{0}'</source> <translation>резюме строки документации не начинается с '{0}'</translation> </message> @@ -7417,7 +7417,7 @@ <context> <name>DownloadManager</name> <message> - <location filename="../WebBrowser/Download/DownloadManager.py" line="363"/> + <location filename="../WebBrowser/Download/DownloadManager.ui" line="14"/> <source>Downloads</source> <translation>Загрузки</translation> </message> @@ -7881,92 +7881,92 @@ <translation>Стандартные кнопки</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="41"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="257"/> <source>Abort</source> <translation>Прервать</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="42"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="264"/> <source>Apply</source> <translation>Применить</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="43"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="271"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="44"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="278"/> <source>Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="45"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="285"/> <source>Discard</source> <translation>Сбросить</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="46"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="292"/> <source>Help</source> <translation>Справка</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="47"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="299"/> <source>Ignore</source> <translation>Игнорировать</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="48"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="306"/> <source>No</source> <translation>Нет</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="49"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="313"/> <source>No to all</source> <translation>Нет для всех</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="50"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="320"/> <source>Ok</source> <translation>Ok</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="51"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="327"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="52"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="334"/> <source>Reset</source> <translation>Сбросить</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="53"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="341"/> <source>Restore defaults</source> <translation>Восстановить умолчания</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="54"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="348"/> <source>Retry</source> <translation>Повтор</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="55"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="355"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="56"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="362"/> <source>Save all</source> <translation>Сохранить всё</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="57"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="369"/> <source>Yes</source> <translation>Да</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="58"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="376"/> <source>Yes to all</source> <translation>Да для всех</translation> </message> @@ -9027,892 +9027,892 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2878"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source>Open File</source> <translation>Открыть файл</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="340"/> + <location filename="../QScintilla/Editor.py" line="343"/> <source><p>The size of the file <b>{0}</b> is <b>{1} KB</b>. Do you really want to load it?</p></source> <translation><p>Файл <b>{0}</b> занимает <b>{1} KB</b>. Вы действительно хотите его загрузить?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="400"/> + <location filename="../QScintilla/Editor.py" line="403"/> <source><b>A Source Editor Window</b><p>This window is used to display and edit a source file. You can open as many of these as you like. The name of the file is displayed in the window's titlebar.</p><p>In order to set breakpoints just click in the space between the line numbers and the fold markers. Via the context menu of the margins they may be edited.</p><p>In order to set bookmarks just Shift click in the space between the line numbers and the fold markers.</p><p>These actions can be reversed via the context menu.</p><p>Ctrl clicking on a syntax error marker shows some info about this error.</p></source> <translation><b>Окно редактора</b><p>Это окно используется для просмотра и редактирования исходных текстов приложений. Вы можете открыть несколько окон одновременно. Имя редактируемого файла отображается в заголовке окна.</p><p>Чтобы установить точку останова - кликните в пространство между номером строки и маркером свёртки на нужной строке. Появившийся маркер точки останова можно настроить через контекстное меню.</p><p>Чтобы установить закладку кликните в пространство между номером строки и меткой свёртки на нужной строке при нажатой клавише Shift.</p><p>Эти действия можно отменить через контекстное меню.</p><p>Если при нажатой клавише Ctrl кликнуть на маркер синтаксической ошибки, то будет показана дополнительная информация об ошибке.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="658"/> - <source>Undo</source> - <translation>Отмена</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="661"/> - <source>Redo</source> - <translation>Повтор</translation> + <source>Undo</source> + <translation>Отмена</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="664"/> + <source>Redo</source> + <translation>Повтор</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="667"/> <source>Revert to last saved state</source> <translation>Вернуть к последнему записанному состоянию</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="668"/> - <source>Cut</source> - <translation>Вырезать</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="671"/> - <source>Copy</source> - <translation>Копировать</translation> + <source>Cut</source> + <translation>Вырезать</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="674"/> + <source>Copy</source> + <translation>Копировать</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="677"/> <source>Paste</source> <translation>Вставить</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="679"/> - <source>Indent</source> - <translation>Увеличить отступ</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="682"/> - <source>Unindent</source> - <translation>Уменьшить отступ</translation> + <source>Indent</source> + <translation>Увеличить отступ</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="685"/> - <source>Comment</source> - <translation>Закомментировать</translation> + <source>Unindent</source> + <translation>Уменьшить отступ</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="688"/> - <source>Uncomment</source> - <translation>Раскомментировать</translation> + <source>Comment</source> + <translation>Закомментировать</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="691"/> - <source>Stream Comment</source> - <translation>Поточный комментарий</translation> + <source>Uncomment</source> + <translation>Раскомментировать</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="694"/> + <source>Stream Comment</source> + <translation>Поточный комментарий</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="697"/> <source>Box Comment</source> <translation>Прямоугольный комментарий</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="698"/> - <source>Select to brace</source> - <translation>Выбрать до скобки</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="700"/> - <source>Select all</source> - <translation>Выбрать всё</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="701"/> + <source>Select to brace</source> + <translation>Выбрать до скобки</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="703"/> + <source>Select all</source> + <translation>Выбрать всё</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="704"/> <source>Deselect all</source> <translation>Снять выделение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7242"/> + <location filename="../QScintilla/Editor.py" line="7249"/> <source>Check spelling...</source> <translation>Проверка орфографии...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="707"/> + <location filename="../QScintilla/Editor.py" line="710"/> <source>Check spelling of selection...</source> <translation>Проверка орфографии выделенного участка...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="711"/> + <location filename="../QScintilla/Editor.py" line="714"/> <source>Remove from dictionary</source> <translation>Удалить из словаря</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="715"/> + <location filename="../QScintilla/Editor.py" line="718"/> <source>Shorten empty lines</source> <translation>Укоротить пустые строки</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="722"/> + <location filename="../QScintilla/Editor.py" line="725"/> <source>Use Monospaced Font</source> <translation>Использовать моноширинный шрифт</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="727"/> + <location filename="../QScintilla/Editor.py" line="730"/> <source>Autosave enabled</source> <translation>Автосохранение разрешено</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="731"/> + <location filename="../QScintilla/Editor.py" line="734"/> <source>Typing aids enabled</source> <translation>Разрешить помощь при наборе</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="768"/> + <location filename="../QScintilla/Editor.py" line="771"/> <source>Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="774"/> - <source>Save</source> - <translation>Сохранить</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="777"/> + <source>Save</source> + <translation>Сохранить</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="780"/> <source>Save As...</source> <translation>Сохранить как...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="790"/> - <source>Print Preview</source> - <translation>Предварительный просмотр печати</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="793"/> + <source>Print Preview</source> + <translation>Предварительный просмотр печати</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="796"/> <source>Print</source> <translation>Печать</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="819"/> + <location filename="../QScintilla/Editor.py" line="822"/> <source>Complete from Document</source> <translation>Дополнение из документа</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="821"/> + <location filename="../QScintilla/Editor.py" line="824"/> <source>Complete from APIs</source> <translation>Дополнение из API</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="823"/> + <location filename="../QScintilla/Editor.py" line="826"/> <source>Complete from Document and APIs</source> <translation>Дополнение из документа и API</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="746"/> + <location filename="../QScintilla/Editor.py" line="749"/> <source>Calltip</source> <translation>Подсказка</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="837"/> + <location filename="../QScintilla/Editor.py" line="840"/> <source>Check</source> <translation>Проверки</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="857"/> - <source>Show</source> - <translation>Показать</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="859"/> - <source>Code metrics...</source> - <translation>Статистика кода...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="860"/> - <source>Code coverage...</source> - <translation>Охват кода...</translation> + <source>Show</source> + <translation>Показать</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="862"/> - <source>Show code coverage annotations</source> - <translation>Показать аннотации по охвату</translation> + <source>Code metrics...</source> + <translation>Статистика кода...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="863"/> + <source>Code coverage...</source> + <translation>Охват кода...</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="865"/> - <source>Hide code coverage annotations</source> - <translation>Не показывать аннотации по охвату</translation> + <source>Show code coverage annotations</source> + <translation>Показать аннотации по охвату</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="868"/> + <source>Hide code coverage annotations</source> + <translation>Не показывать аннотации по охвату</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="871"/> <source>Profile data...</source> <translation>Данные профайлера...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="881"/> + <location filename="../QScintilla/Editor.py" line="884"/> <source>Diagrams</source> <translation>Диаграммы</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="883"/> + <location filename="../QScintilla/Editor.py" line="886"/> <source>Class Diagram...</source> <translation>Диаграмма классов...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="885"/> + <location filename="../QScintilla/Editor.py" line="888"/> <source>Package Diagram...</source> <translation>Диаграмма пакетов...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="887"/> + <location filename="../QScintilla/Editor.py" line="890"/> <source>Imports Diagram...</source> <translation>Диаграмма импортирования...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="889"/> + <location filename="../QScintilla/Editor.py" line="892"/> <source>Application Diagram...</source> <translation>Диаграмма приложения...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="907"/> - <source>Languages</source> - <translation>Языки</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="910"/> + <source>Languages</source> + <translation>Языки</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="913"/> <source>No Language</source> <translation>Нет языка</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="933"/> + <location filename="../QScintilla/Editor.py" line="936"/> <source>Guessed</source> <translation>Предполагаемый язык</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1268"/> + <location filename="../QScintilla/Editor.py" line="1271"/> <source>Alternatives</source> <translation>Альтернативная подсветка</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="953"/> + <location filename="../QScintilla/Editor.py" line="956"/> <source>Encodings</source> <translation>Кодировки</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="994"/> + <location filename="../QScintilla/Editor.py" line="997"/> <source>End-of-Line Type</source> <translation>Тип конца строки</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="998"/> + <location filename="../QScintilla/Editor.py" line="1001"/> <source>Unix</source> <translation>Unix</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1005"/> + <location filename="../QScintilla/Editor.py" line="1008"/> <source>Windows</source> <translation>Windows</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1012"/> + <location filename="../QScintilla/Editor.py" line="1015"/> <source>Macintosh</source> <translation>Macintosh</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1030"/> + <location filename="../QScintilla/Editor.py" line="1033"/> <source>Export as</source> <translation>Экспортировать как</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1153"/> + <location filename="../QScintilla/Editor.py" line="1156"/> <source>Toggle bookmark</source> <translation>Создать/Удалить закладку</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1155"/> + <location filename="../QScintilla/Editor.py" line="1158"/> <source>Next bookmark</source> <translation>Следующая закладка</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1157"/> + <location filename="../QScintilla/Editor.py" line="1160"/> <source>Previous bookmark</source> <translation>Предыдущая закладка</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1159"/> + <location filename="../QScintilla/Editor.py" line="1162"/> <source>Clear all bookmarks</source> <translation>Очистить все закладки</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1179"/> + <location filename="../QScintilla/Editor.py" line="1182"/> <source>Toggle breakpoint</source> <translation>Поставить/убрать точку останова</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1181"/> - <source>Toggle temporary breakpoint</source> - <translation>Поставить/убрать временную точку останова</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1184"/> + <source>Toggle temporary breakpoint</source> + <translation>Поставить/убрать временную точку останова</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1187"/> <source>Edit breakpoint...</source> <translation>Редактировать точку останова...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5154"/> + <location filename="../QScintilla/Editor.py" line="5161"/> <source>Enable breakpoint</source> <translation>Разрешить точку останова</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1189"/> + <location filename="../QScintilla/Editor.py" line="1192"/> <source>Next breakpoint</source> <translation>Следующая точка останова</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1191"/> + <location filename="../QScintilla/Editor.py" line="1194"/> <source>Previous breakpoint</source> <translation>Предыдущая точка останова</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1193"/> + <location filename="../QScintilla/Editor.py" line="1196"/> <source>Clear all breakpoints</source> <translation>Убрать все точки останова</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1162"/> + <location filename="../QScintilla/Editor.py" line="1165"/> <source>Goto syntax error</source> <translation>Перейти к синтаксической ошибке</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1164"/> + <location filename="../QScintilla/Editor.py" line="1167"/> <source>Show syntax error message</source> <translation>Показать сообщение о синтаксической ошибке</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1166"/> - <source>Clear syntax error</source> - <translation>Очистить синтаксическую ошибку</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1169"/> - <source>Next warning</source> - <translation>Следующее предупреждение</translation> + <source>Clear syntax error</source> + <translation>Очистить синтаксическую ошибку</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="1172"/> + <source>Next warning</source> + <translation>Следующее предупреждение</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1175"/> <source>Previous warning</source> <translation>Предыдущее предупреждение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1174"/> + <location filename="../QScintilla/Editor.py" line="1177"/> <source>Show warning message</source> <translation>Показать предупреждение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1176"/> + <location filename="../QScintilla/Editor.py" line="1179"/> <source>Clear warnings</source> <translation>Очистить предупреждения</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1196"/> - <source>Next uncovered line</source> - <translation>Следующая неохваченная строка</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1199"/> - <source>Previous uncovered line</source> - <translation>Предыдущая неохваченная строка</translation> + <source>Next uncovered line</source> + <translation>Следующая неохваченная строка</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="1202"/> + <source>Previous uncovered line</source> + <translation>Предыдущая неохваченная строка</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1205"/> <source>Next task</source> <translation>Следующая задача</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1204"/> + <location filename="../QScintilla/Editor.py" line="1207"/> <source>Previous task</source> <translation>Предыдущая задача</translation> </message> <message> + <location filename="../QScintilla/Editor.py" line="1216"/> + <source>LMB toggles bookmarks</source> + <translation>Левая клавиша мыши позволяет Создать/Удалить закладку</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1220"/> + <source>LMB toggles breakpoints</source> + <translation>Левая клавиша мыши позволяет Создать/Удалить точку останова</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1256"/> + <source>Export source</source> + <translation>Экспортировать исходник</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1248"/> + <source><p>No exporter available for the export format <b>{0}</b>. Aborting...</p></source> + <translation><p>Не найден экспортёр для формата <b>{0}</b>. Отмена...</p></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1256"/> + <source>No export format given. Aborting...</source> + <translation>Не задан формат экспорта. Прерывание...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1267"/> + <source>Alternatives ({0})</source> + <translation>Альтернативы ({0})</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1287"/> + <source>Pygments Lexer</source> + <translation>Лексер подсветки</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1287"/> + <source>Select the Pygments lexer to apply.</source> + <translation>Задайте лексер подсветки синтаксиса.</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1757"/> + <source>Modification of Read Only file</source> + <translation>Редактирование файла, открытого только на чтение</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1757"/> + <source>You are attempting to change a read only file. Please save to a different file first.</source> + <translation>Попытка редактирования файла, открытого только на чтение. Пожалуйста, сначала сохраните изменения в другой файл.</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2448"/> + <source>Printing...</source> + <translation>Печать...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2465"/> + <source>Printing completed</source> + <translation>Печать завершена</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2467"/> + <source>Error while printing</source> + <translation>Ошибка печати</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2470"/> + <source>Printing aborted</source> + <translation>Печать прервана</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2828"/> + <source>File Modified</source> + <translation>Файл изменён</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2828"/> + <source><p>The file <b>{0}</b> has unsaved changes.</p></source> + <translation><p>В файле <b>{0}</b> есть несохранённые изменения.</p></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2883"/> + <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> + <translation><p>Невозможно прочитать файл <b>{0}</b>.</p><p>Причина: {1}</p></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="3046"/> + <source>Save File</source> + <translation>Сохранить файл</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2987"/> + <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> + <translation><p>Невозможно сохранить файл <b>{0}</b>:<br>Причина: {1}.</p></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="3046"/> + <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>Файл <b>{0}</b> уже существует. Переписать?</p></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="4434"/> + <source>Autocompletion</source> + <translation>Автодополнение</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="4434"/> + <source>Autocompletion is not available because there is no autocompletion source set.</source> + <translation>Автодополнение недоступно, так как не задан источник автодополнения.</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5164"/> + <source>Disable breakpoint</source> + <translation>Запретить точку останова</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5538"/> + <source>Code Coverage</source> + <translation>Охват кода</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5538"/> + <source>Please select a coverage file</source> + <translation>Пожалуйста, выберите файл для информации охвата</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5601"/> + <source>Show Code Coverage Annotations</source> + <translation>Показать аннотации по охвату</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5594"/> + <source>All lines have been covered.</source> + <translation>Все строки выполняются.</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5601"/> + <source>There is no coverage file available.</source> + <translation>Нет файла с информацией по охвату.</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5716"/> + <source>Profile Data</source> + <translation>Данные профайлера</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5716"/> + <source>Please select a profile file</source> + <translation>Пожалуйста, выберите файл профиля</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5876"/> + <source>Syntax Error</source> + <translation>Синтаксическая ошибка</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5876"/> + <source>No syntax error message available.</source> + <translation>Нет сообщения о синтаксической ошибке.</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6191"/> + <source>Macro Name</source> + <translation>Имя макроса</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6191"/> + <source>Select a macro name:</source> + <translation>Задайте имя макроса:</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6219"/> + <source>Load macro file</source> + <translation>Загрузить макрос</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6262"/> + <source>Macro files (*.macro)</source> + <translation>Макросы (*.macro)</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6242"/> + <source>Error loading macro</source> + <translation>Ошибка при загрузке макроса</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6233"/> + <source><p>The macro file <b>{0}</b> could not be read.</p></source> + <translation><p>Невозможно прочитать файл с макросами: <b>{0}</b></p></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6242"/> + <source><p>The macro file <b>{0}</b> is corrupt.</p></source> + <translation><p>Файл с макросами <b>{0}</b> повреждён</p></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6262"/> + <source>Save macro file</source> + <translation>Сохранить файл с макросами</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6279"/> + <source>Save macro</source> + <translation>Сохранить макрос</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6279"/> + <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>Макро <b>{0}</b> уже существует. Переписать?</p></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6295"/> + <source>Error saving macro</source> + <translation>Ошибка при сохранении макроса</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6295"/> + <source><p>The macro file <b>{0}</b> could not be written.</p></source> + <translation><p>Невозможно сохранить файл с макросами: <b>{0}</b></p></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6308"/> + <source>Start Macro Recording</source> + <translation>Начать запись макроса</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6308"/> + <source>Macro recording is already active. Start new?</source> + <translation>Запись макроса уже идёт. Начать новую запись?</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6334"/> + <source>Macro Recording</source> + <translation>Запись макроса</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6334"/> + <source>Enter name of the macro:</source> + <translation>Задайте имя макроса:</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6472"/> + <source>File changed</source> + <translation>Файл изменен</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6636"/> + <source>{0} (ro)</source> + <translation>{0} (только чтение)</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6776"/> + <source>Drop Error</source> + <translation>Ошибка Drag&&Drop</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6776"/> + <source><p><b>{0}</b> is not a file.</p></source> + <translation><p><b>{0}</b> не является файлом</p></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6797"/> + <source>Resources</source> + <translation>Ресурсы</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6799"/> + <source>Add file...</source> + <translation>Добавить файл...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6801"/> + <source>Add files...</source> + <translation>Добавить файлы...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6803"/> + <source>Add aliased file...</source> + <translation>Добавить файл под другим именем...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6806"/> + <source>Add localized resource...</source> + <translation>Добавить локализованный ресурс...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6810"/> + <source>Add resource frame</source> + <translation>Добавить фрагмент ресурсов</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6829"/> + <source>Add file resource</source> + <translation>Добавить файл ресурсов</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6845"/> + <source>Add file resources</source> + <translation>Добавить файлы ресурсов</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6873"/> + <source>Add aliased file resource</source> + <translation>Добавить файл ресурсов под другим именем</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6873"/> + <source>Alias for file <b>{0}</b>:</source> + <translation>Другое имя для файла <b>{0}</b>:</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6937"/> + <source>Package Diagram</source> + <translation>Диаграмма пакетов</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6937"/> + <source>Include class attributes?</source> + <translation>Включать атрибуты класса?</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6957"/> + <source>Imports Diagram</source> + <translation>Диаграмма импортов</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6957"/> + <source>Include imports from external modules?</source> + <translation>Включать импорты из внешних модулей?</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6971"/> + <source>Application Diagram</source> + <translation>Диаграмма приложения</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6971"/> + <source>Include module names?</source> + <translation>Включать имена модулей?</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7252"/> + <source>Add to dictionary</source> + <translation>Добавить в словарь</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7254"/> + <source>Ignore All</source> + <translation>Игнорировать всё</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6130"/> + <source>Warning: {0}</source> + <translation>Предупреждение: {0}</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6137"/> + <source>Error: {0}</source> + <translation>Ошибка: {0}</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6468"/> + <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> + <translation><br><b>Предупреждение:</b> При переоткрытии все изменения будут потеряны.</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="4539"/> + <source>Activating Auto-Completion Provider</source> + <translation>Активация источника автодополнения</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="4539"/> + <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> + <translation>Автодополнение не может быть подключено, потому что оно уже активно. Пожалуйста, проверьте конфигурацию.</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="4859"/> + <source>Activating Calltip Provider</source> + <translation>Активация подсказок</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="4859"/> + <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> + <translation>Подсказки не могут быть подключены, потому что уже активны. Пожалуйста проверьте конфигурацию.</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="789"/> + <source>Open 'rejection' file</source> + <translation>Открыть 'отбракованный' файл</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="896"/> + <source>Load Diagram...</source> + <translation>Загрузить диаграмму...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1210"/> + <source>Next change</source> + <translation>Следующее изменение</translation> + </message> + <message> <location filename="../QScintilla/Editor.py" line="1213"/> - <source>LMB toggles bookmarks</source> - <translation>Левая клавиша мыши позволяет Создать/Удалить закладку</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1217"/> - <source>LMB toggles breakpoints</source> - <translation>Левая клавиша мыши позволяет Создать/Удалить точку останова</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1253"/> - <source>Export source</source> - <translation>Экспортировать исходник</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1245"/> - <source><p>No exporter available for the export format <b>{0}</b>. Aborting...</p></source> - <translation><p>Не найден экспортёр для формата <b>{0}</b>. Отмена...</p></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1253"/> - <source>No export format given. Aborting...</source> - <translation>Не задан формат экспорта. Прерывание...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1264"/> - <source>Alternatives ({0})</source> - <translation>Альтернативы ({0})</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1284"/> - <source>Pygments Lexer</source> - <translation>Лексер подсветки</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1284"/> - <source>Select the Pygments lexer to apply.</source> - <translation>Задайте лексер подсветки синтаксиса.</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1752"/> - <source>Modification of Read Only file</source> - <translation>Редактирование файла, открытого только на чтение</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1752"/> - <source>You are attempting to change a read only file. Please save to a different file first.</source> - <translation>Попытка редактирования файла, открытого только на чтение. Пожалуйста, сначала сохраните изменения в другой файл.</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2443"/> - <source>Printing...</source> - <translation>Печать...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2460"/> - <source>Printing completed</source> - <translation>Печать завершена</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2462"/> - <source>Error while printing</source> - <translation>Ошибка печати</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2465"/> - <source>Printing aborted</source> - <translation>Печать прервана</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2823"/> - <source>File Modified</source> - <translation>Файл изменён</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2823"/> - <source><p>The file <b>{0}</b> has unsaved changes.</p></source> - <translation><p>В файле <b>{0}</b> есть несохранённые изменения.</p></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2878"/> - <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> - <translation><p>Невозможно прочитать файл <b>{0}</b>.</p><p>Причина: {1}</p></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="3041"/> - <source>Save File</source> - <translation>Сохранить файл</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2982"/> - <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> - <translation><p>Невозможно сохранить файл <b>{0}</b>:<br>Причина: {1}.</p></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="3041"/> - <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation><p>Файл <b>{0}</b> уже существует. Переписать?</p></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="4427"/> - <source>Autocompletion</source> - <translation>Автодополнение</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="4427"/> - <source>Autocompletion is not available because there is no autocompletion source set.</source> - <translation>Автодополнение недоступно, так как не задан источник автодополнения.</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5157"/> - <source>Disable breakpoint</source> - <translation>Запретить точку останова</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5531"/> - <source>Code Coverage</source> - <translation>Охват кода</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5531"/> - <source>Please select a coverage file</source> - <translation>Пожалуйста, выберите файл для информации охвата</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5594"/> - <source>Show Code Coverage Annotations</source> - <translation>Показать аннотации по охвату</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5587"/> - <source>All lines have been covered.</source> - <translation>Все строки выполняются.</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5594"/> - <source>There is no coverage file available.</source> - <translation>Нет файла с информацией по охвату.</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5709"/> - <source>Profile Data</source> - <translation>Данные профайлера</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5709"/> - <source>Please select a profile file</source> - <translation>Пожалуйста, выберите файл профиля</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5869"/> - <source>Syntax Error</source> - <translation>Синтаксическая ошибка</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5869"/> - <source>No syntax error message available.</source> - <translation>Нет сообщения о синтаксической ошибке.</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6184"/> - <source>Macro Name</source> - <translation>Имя макроса</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6184"/> - <source>Select a macro name:</source> - <translation>Задайте имя макроса:</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6212"/> - <source>Load macro file</source> - <translation>Загрузить макрос</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6255"/> - <source>Macro files (*.macro)</source> - <translation>Макросы (*.macro)</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6235"/> - <source>Error loading macro</source> - <translation>Ошибка при загрузке макроса</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6226"/> - <source><p>The macro file <b>{0}</b> could not be read.</p></source> - <translation><p>Невозможно прочитать файл с макросами: <b>{0}</b></p></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6235"/> - <source><p>The macro file <b>{0}</b> is corrupt.</p></source> - <translation><p>Файл с макросами <b>{0}</b> повреждён</p></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6255"/> - <source>Save macro file</source> - <translation>Сохранить файл с макросами</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6272"/> - <source>Save macro</source> - <translation>Сохранить макрос</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6272"/> - <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation><p>Макро <b>{0}</b> уже существует. Переписать?</p></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6288"/> - <source>Error saving macro</source> - <translation>Ошибка при сохранении макроса</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6288"/> - <source><p>The macro file <b>{0}</b> could not be written.</p></source> - <translation><p>Невозможно сохранить файл с макросами: <b>{0}</b></p></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6301"/> - <source>Start Macro Recording</source> - <translation>Начать запись макроса</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6301"/> - <source>Macro recording is already active. Start new?</source> - <translation>Запись макроса уже идёт. Начать новую запись?</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6327"/> - <source>Macro Recording</source> - <translation>Запись макроса</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6327"/> - <source>Enter name of the macro:</source> - <translation>Задайте имя макроса:</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6465"/> - <source>File changed</source> - <translation>Файл изменен</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6629"/> - <source>{0} (ro)</source> - <translation>{0} (только чтение)</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6769"/> - <source>Drop Error</source> - <translation>Ошибка Drag&&Drop</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6769"/> - <source><p><b>{0}</b> is not a file.</p></source> - <translation><p><b>{0}</b> не является файлом</p></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6790"/> - <source>Resources</source> - <translation>Ресурсы</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6792"/> - <source>Add file...</source> - <translation>Добавить файл...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6794"/> - <source>Add files...</source> - <translation>Добавить файлы...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6796"/> - <source>Add aliased file...</source> - <translation>Добавить файл под другим именем...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6799"/> - <source>Add localized resource...</source> - <translation>Добавить локализованный ресурс...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6803"/> - <source>Add resource frame</source> - <translation>Добавить фрагмент ресурсов</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6822"/> - <source>Add file resource</source> - <translation>Добавить файл ресурсов</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6838"/> - <source>Add file resources</source> - <translation>Добавить файлы ресурсов</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6866"/> - <source>Add aliased file resource</source> - <translation>Добавить файл ресурсов под другим именем</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6866"/> - <source>Alias for file <b>{0}</b>:</source> - <translation>Другое имя для файла <b>{0}</b>:</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6930"/> - <source>Package Diagram</source> - <translation>Диаграмма пакетов</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6930"/> - <source>Include class attributes?</source> - <translation>Включать атрибуты класса?</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6950"/> - <source>Imports Diagram</source> - <translation>Диаграмма импортов</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6950"/> - <source>Include imports from external modules?</source> - <translation>Включать импорты из внешних модулей?</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6964"/> - <source>Application Diagram</source> - <translation>Диаграмма приложения</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6964"/> - <source>Include module names?</source> - <translation>Включать имена модулей?</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="7245"/> - <source>Add to dictionary</source> - <translation>Добавить в словарь</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="7247"/> - <source>Ignore All</source> - <translation>Игнорировать всё</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6123"/> - <source>Warning: {0}</source> - <translation>Предупреждение: {0}</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6130"/> - <source>Error: {0}</source> - <translation>Ошибка: {0}</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6461"/> - <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> - <translation><br><b>Предупреждение:</b> При переоткрытии все изменения будут потеряны.</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="4532"/> - <source>Activating Auto-Completion Provider</source> - <translation>Активация источника автодополнения</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="4532"/> - <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> - <translation>Автодополнение не может быть подключено, потому что оно уже активно. Пожалуйста, проверьте конфигурацию.</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="4852"/> - <source>Activating Calltip Provider</source> - <translation>Активация подсказок</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="4852"/> - <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> - <translation>Подсказки не могут быть подключены, потому что уже активны. Пожалуйста проверьте конфигурацию.</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="786"/> - <source>Open 'rejection' file</source> - <translation>Открыть 'отбракованный' файл</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="893"/> - <source>Load Diagram...</source> - <translation>Загрузить диаграмму...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1207"/> - <source>Next change</source> - <translation>Следующее изменение</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1210"/> <source>Previous change</source> <translation>Предыдущее изменение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7659"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>Sort Lines</source> <translation>Сортировать строки</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7659"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>Выборка содержит данные неподходящие для сортировки как числа.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6059"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6059"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>No warning messages available.</source> <translation>Нет предупреждающего сообщения.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6120"/> + <location filename="../QScintilla/Editor.py" line="6127"/> <source>Style: {0}</source> <translation>Стиль: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="760"/> - <source>New Document View</source> - <translation>Новое окно для документа</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="763"/> + <source>New Document View</source> + <translation>Новое окно для документа</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="766"/> <source>New Document View (with new split)</source> <translation>Новое окно для документа (в новом разделе)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="847"/> + <location filename="../QScintilla/Editor.py" line="850"/> <source>Tools</source> <translation>Инструменты</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="975"/> + <location filename="../QScintilla/Editor.py" line="978"/> <source>Re-Open With Encoding</source> <translation>Открыть заново с кодировкой</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6455"/> + <location filename="../QScintilla/Editor.py" line="6462"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation><p>Файл <b>{0}</b> был изменён, будучи открытым в Eric6. Обновить?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="738"/> + <location filename="../QScintilla/Editor.py" line="741"/> <source>Automatic Completion enabled</source> <translation>Автоматическое дополнение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="816"/> + <location filename="../QScintilla/Editor.py" line="819"/> <source>Complete</source> <translation>Дополнить</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4581"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>Auto-Completion Provider</source> <translation>Источник автодополнений</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4581"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>Список дополнений источника '{0}' уже зарегистрирован. Повторный запрос проигнорирован.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>Call-Tips Provider</source> <translation>Источник всплывающих подсказок </translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>Источник всплывающих подсказок '{0}' уже зарегистрирован. Повторный запрос проигнорирован.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7746"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>Register Mouse Click Handler</source> <translation>Регистрация обработчика кликов мышки</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7746"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation>Обработчик кликов мышки для "{0}" уже зарегистрирован "{1}". Запрос прерван "{2}"...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="780"/> + <location filename="../QScintilla/Editor.py" line="783"/> <source>Save Copy...</source> <translation>Сохранить копию...</translation> </message> @@ -9985,7 +9985,7 @@ <translation>Выбор API-файла из списка установленных файлов</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="146"/> <source>Add from installed APIs</source> <translation>Добавить из списка установленных файлов API</translation> </message> @@ -9995,7 +9995,7 @@ <translation>Выбор API-файла из списка API-файлов установленных плагинов</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="156"/> <source>Add from Plugin APIs</source> <translation>Добавить из списка файлов API, установленных с помощью плагинов</translation> </message> @@ -10005,7 +10005,7 @@ <translation>Компиляция выбранных определений API</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="299"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="173"/> <source>Compile APIs</source> <translation>Компилировать API</translation> </message> @@ -10015,22 +10015,22 @@ <translation>Файлы API (*.api);;Все файлы (*)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="238"/> <source>Select from the list of installed API files</source> <translation>Выбрать из списка установленных файлов API</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> <source>Select from the list of API files installed by plugins</source> <translation>Выбрать из списка API-файлов, установленных с помощью плагинов</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="314"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="316"/> <source>Cancel compilation</source> <translation>Отменить компиляцию</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> <source>There are no APIs installed yet. Selection is not available.</source> <translation>API не установлено. Выбор невозможен.</translation> </message> @@ -10198,6 +10198,89 @@ </message> </context> <context> + <name>EditorButtonsWidget</name> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="175"/> + <source>Bold</source> + <translation>Жирный текст</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="177"/> + <source>Italic</source> + <translation>Курсив</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="179"/> + <source>Strike Through</source> + <translation>Зачеркнутый текст</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="182"/> + <source>Header 1</source> + <translation>Заголовок 1</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="184"/> + <source>Header 2</source> + <translation>Заголовок 2</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="186"/> + <source>Header 3</source> + <translation>Заголовок 3</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="188"/> + <source>Header</source> + <translation>Заголовок</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="193"/> + <source>Inline Code</source> + <translation>Строки кода</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="195"/> + <source>Code Block</source> + <translation>Блок кода</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="197"/> + <source>Quote</source> + <translation>Цитата</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="200"/> + <source>Add Hyperlink</source> + <translation>Добавить гиперссылку</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="202"/> + <source>Add Horizontal Line</source> + <translation>Добавить горизонтальную строку</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="204"/> + <source>Add Image</source> + <translation>Добавить изображение</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="207"/> + <source>Add Bulleted List</source> + <translation>Добавить маркированный список</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="209"/> + <source>Add Numbered List</source> + <translation>Добавить нумерованный список</translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="273"/> + <source>Level {0}</source> + <translation>Уровень {0}</translation> + </message> +</context> +<context> <name>EditorCalltipsPage</name> <message> <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="17"/> @@ -11007,7 +11090,7 @@ <translation>Альтернативный лексический анализатор</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightersPage.py" line="142"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightersPage.py" line="146"/> <source>Alternative</source> <translation>Альтернативный</translation> </message> @@ -11060,7 +11143,7 @@ <translation>Выберите шрифт.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/> <source>Font</source> <translation>Шрифт</translation> </message> @@ -11070,7 +11153,7 @@ <translation>Разрешить заливку фона до конца строки.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="113"/> <source>Fill to end of line</source> <translation>Заливка до конца строки</translation> </message> @@ -11180,42 +11263,42 @@ <translation>Только размер</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="351"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="355"/> <source>Enabled</source> <translation>Разрешена</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="352"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="356"/> <source>Disabled</source> <translation>Отключена</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> <source>Select fill to end of line for all styles</source> <translation>Заливка до конца строки для всех стилей</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465"/> <source>Export Highlighting Styles</source> <translation>Экспорт стилей подсветки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="477"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="481"/> <source>Highlighting styles file (*.e4h)</source> <translation>Файлы стилей подсветки (*.e4h)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465"/> <source><p>The highlighting styles could not be exported to file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Невозможен экспорт стилей подсветки в файл <b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="497"/> <source>Import Highlighting Styles</source> <translation>Импорт стилей подсветки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="497"/> <source><p>The highlighting styles could not be read from file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Невозможно чтение стилей подсветки из файла <b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> @@ -11327,12 +11410,12 @@ <translation>Свойства лексического анализатора Bash</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1048"/> <source>Select whether folding of comments shall be possible</source> <translation>Разрешить сворачивать комментарии</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1051"/> <source>Fold comments</source> <translation>Сворачивать комментарии</translation> </message> @@ -11342,22 +11425,22 @@ <translation>Свойства лексических анализаторов C++ , C# , IDL, Java и JavaScript</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="990"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/> <source>Select whether folding at else statement should be possible</source> <translation>Разрешить сворачивать оператор else</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/> <source>Fold at else</source> <translation>Сворачивать else</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="522"/> <source>Select whether folding of preprocessor directives shall be possible</source> <translation>Разрешить сворачивать директивы препроцессора</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="525"/> <source>Fold preprocessor directives</source> <translation>Сворачивать директивы препроцессора</translation> </message> @@ -11467,187 +11550,187 @@ <translation>Стиль скриптов</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/> <source>Pascal Lexer Properties</source> <translation>Свойства лексического анализатора Pascal</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="503"/> - <source>Select to enable smart highlighting of keywords</source> - <translation>Разрешить интеллектуальную подсветку ключевых слов</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/> - <source>Smart Highlighting</source> - <translation>Интеллектуальная подсветка</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="516"/> - <source>Perl Lexer Properties</source> - <translation>Свойства лексического анализатора Perl</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/> - <source>Select to enable folding of Perl packages</source> - <translation>Разрешить сворачивать Perl пакеты</translation> + <source>Select to enable smart highlighting of keywords</source> + <translation>Разрешить интеллектуальную подсветку ключевых слов</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="535"/> - <source>Fold packages</source> - <translation>Сворачивать пакеты</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="542"/> - <source>Select to enable folding of Perl POD blocks</source> - <translation>Разрешить сворачивать Perl POD блоки</translation> + <source>Smart Highlighting</source> + <translation>Интеллектуальная подсветка</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/> + <source>Perl Lexer Properties</source> + <translation>Свойства лексического анализатора Perl</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="561"/> + <source>Select to enable folding of Perl packages</source> + <translation>Разрешить сворачивать Perl пакеты</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="564"/> + <source>Fold packages</source> + <translation>Сворачивать пакеты</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="571"/> + <source>Select to enable folding of Perl POD blocks</source> + <translation>Разрешить сворачивать Perl POD блоки</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="574"/> <source>Fold POD blocks</source> <translation>Сворачивать POD блоки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="565"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="594"/> <source>PostScript Lexer Properties</source> <translation>Свойства лексического анализатора PostScript</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="581"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="610"/> <source>Select to mark tokens</source> <translation>Разрешить выделять токены</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="584"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="613"/> <source>Mark Tokens</source> <translation>Выделять токены</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="593"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="622"/> <source>PostScript Level:</source> <translation>Уровень PostScript:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="600"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="629"/> <source>Select the PostScript level</source> <translation>Выбрать уровень PostScript</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="637"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/> <source>Povray Lexer Properties</source> <translation>Свойства лексического анализатора Povray</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="643"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/> <source>Select whether folding of directives shall be possible</source> <translation>Разрешить сворачивать директивы</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="646"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/> <source>Fold directives</source> <translation>Сворачивать директивы</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="685"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> <source>Python Lexer Properties</source> <translation>Свойства лексического анализатора Python</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="796"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="825"/> <source>Select whether bad indentation shall be highlighted</source> <translation>Разрешить подсветку неверных отступов</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="730"/> <source>Select whether folding of strings shall be possible</source> <translation>Разрешить сворачивать строки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="733"/> <source>Fold strings</source> <translation>Сворачивать строки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="721"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="750"/> <source>Select whether text should be autoindented after a ':'</source> <translation>Разрешить автоматическое выравнивание текста (с отступом) после ':'</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="724"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="753"/> <source>Auto indentation after ':'</source> <translation>Автоотступ после ':'</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="741"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="770"/> <source>Select to allow Python v2 unicode string literals (e.g. u"utf8")</source> <translation>Разрешить Python v2 юникодные литералы (например u"utf8")</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="744"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="773"/> <source>Allow v2 unicode string literals</source> <translation>Разрешить Python v2 юникодные литералы</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="751"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="780"/> <source>Select to allow Python v3 binary and octal literals (e.g. 0b1011, 0o712)</source> <translation>Разрешить Python v3 двоичные и восьмеричные литералы (например 0b1011, 0o712)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="754"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/> <source>Allow v3 binary and octal literals</source> <translation>Разрешить Python v3 двоичные и восьмеричные литералы</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="761"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="790"/> <source>Select to allow Python v3 bytes string literals (e.g. b"bytes")</source> <translation>Разрешить Python v3 байтовые литералы (например b"bytes")</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="764"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="793"/> <source>Allow v3 bytes string literals</source> <translation>Разрешить Python v3 байтовые литералы</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="827"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/> <source>SQL Lexer Properties</source> <translation>Свойства лексического анализатора SQL</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="863"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="892"/> <source>Select to enable Backslash Escapes</source> <translation>Разрешить экранирование обратным слэшем</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="866"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="895"/> <source>Backslash Escapes</source> <translation>Экранирование обратным слэшем</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="964"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/> <source>VHDL Lexer Properties</source> <translation>Свойства лексического анализатора VHDL</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="999"/> <source>Select whether folding of blocks at a parenthesis shall be possible</source> <translation>Разрешить сворачивать блоки в круглых скобках</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1002"/> <source>Fold at parenthesis</source> <translation>Сворачивать круглые скобки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1009"/> <source>Select whether folding of begin blocks shall be possible</source> <translation>Разрешить сворачивать блоки begin</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1012"/> <source>Fold at begin</source> <translation>Сворачивать begin</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1013"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1042"/> <source>YAML Lexer Properties</source> <translation>Свойства лексического анализатора YAML</translation> </message> @@ -11682,112 +11765,112 @@ <translation>Разрешить шаблоны Mako</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="695"/> <source>Properties Lexer Properties</source> <translation>Свойства лексического анализатора</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/> <source>Select to allow initial spaces in a line</source> <translation>Разрешить начальные пробелы в строке</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/> <source>Allow initial spaces</source> <translation>Разрешить начальные пробелы</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="740"/> <source>Select whether folding of triple quoted strings shall be possible</source> <translation>Разрешить сворачивать строки в тройных кавычках</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="743"/> <source>Fold triple quoted strings</source> <translation>Сворачивать строки в тройных кавычках</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="760"/> <source>Select to allow strings to span newline characters</source> <translation>Разрешить дополнение строки символом новой строки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="734"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="763"/> <source>Strings may span newline characters</source> <translation>Дополнение строки символом новой строки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="808"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="837"/> <source>Ruby Lexer Properties</source> <translation>Свойства лексического анализатора Ruby</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="853"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="882"/> <source>Select whether only BEGIN blocks can be folded</source> <translation>Разрешить сворачивание только BEGIN блоков</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="885"/> <source>Only BEGIN blocks can be folded</source> <translation>Только BEGIN блоки могут быть свернуты</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="873"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="902"/> <source>Select if words may contain dots</source> <translation>Разрешить использовать точки при написании слов</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="876"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="905"/> <source>Words may contain dots</source> <translation>Слова могут содержать точки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="883"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="912"/> <source>Select to allow '#' as a comment character</source> <translation>Разрешить символ '#' как символ коментариев</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="886"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="915"/> <source>Allow '#' as comment character</source> <translation>Разрешать символ '#' как символ коментариев</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="893"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="922"/> <source>Select to enable quoted identifiers</source> <translation>Разрешить заключать в кавычки идентификаторы</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="896"/> - <source>Enable quoted identifiers</source> - <translation>Разрешать заключать в кавычки идентификаторы</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="906"/> - <source>TCL Lexer Properties</source> - <translation>Свойства лексического анализатора TCL</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="925"/> - <source>TeX Lexer Properties</source> - <translation>Свойства лексического анализатора TeX</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="941"/> - <source>Select to treat comments as TeX source</source> - <translation>Разрешить считать коментарии как TeX код</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="944"/> - <source>Treat comments as TeX source</source> - <translation>Считать коментарии как TeX код</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="951"/> - <source>Select to treat \if<unknown> as a command</source> - <translation>Разрешить считать \if<unknown> командой</translation> + <source>Enable quoted identifiers</source> + <translation>Разрешать заключать в кавычки идентификаторы</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="935"/> + <source>TCL Lexer Properties</source> + <translation>Свойства лексического анализатора TCL</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="954"/> + <source>TeX Lexer Properties</source> + <translation>Свойства лексического анализатора TeX</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/> + <source>Select to treat comments as TeX source</source> + <translation>Разрешить считать коментарии как TeX код</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/> + <source>Treat comments as TeX source</source> + <translation>Считать коментарии как TeX код</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/> + <source>Select to treat \if<unknown> as a command</source> + <translation>Разрешить считать \if<unknown> командой</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/> <source>Treat \if<unknown> as command</source> <translation>Считать \if<unknown> командой</translation> </message> @@ -11797,7 +11880,7 @@ <translation>Выделять строки в тройных кавычках</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="774"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="803"/> <source>Highlight sub-identifiers</source> <translation>Подсвечивать субидентификаторы</translation> </message> @@ -11807,7 +11890,7 @@ <translation>Разрешить выделение строк в тройных кавычках</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="771"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="800"/> <source>Select to highlight sub-identifiers defined in keyword set 2</source> <translation>Разрешить подсвечивать субидентификаторы, определенные в ключе set 2</translation> </message> @@ -11862,32 +11945,32 @@ <translation>CoffeeScript</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="812"/> <source>Highlight bad indentation:</source> <translation>Подсвечивать неправильный отступ:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>No Warning</source> <translation>Без предупреждения</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Inconsistent</source> <translation>Несогласованные</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Tabs after Spaces</source> <translation>Символ табуляции после пробела</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Spaces</source> <translation>Пробелы</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Tabs</source> <translation>Вкладки</translation> </message> @@ -11907,7 +11990,7 @@ <translation>Разрешить подсветку escape-последовательностей</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="194"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/> <source>Highlight escape sequences</source> <translation>Подсвечивать escape-последовательности</translation> </message> @@ -11921,6 +12004,26 @@ <source>Allow verbatim string escape sequences</source> <translation>Точное соответствие строки escape-последовательности</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/> + <source>JSON</source> + <translation>JSON</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="483"/> + <source>Select to enable highlighting of line/block comments</source> + <translation>Разрешить подсвечивать строки/блоки комментариев</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="486"/> + <source>Highlight comments</source> + <translation>Подсвечивать комментарии</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/> + <source>Select to enable highlighting of escape sequences in strings</source> + <translation>Разрешить подсвечивать escape-последовательности в строках</translation> + </message> </context> <context> <name>EditorSearchPage</name> @@ -12592,7 +12695,7 @@ <translation>Режим:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/> <source>Disabled</source> <translation>Отключена</translation> </message> @@ -13036,6 +13139,16 @@ <source>Select the colour for the search marker</source> <translation>Выберите цвет маркеров поиска</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1866"/> + <source>Select to hide the Format Buttons bar when formatting is not supported</source> + <translation>Разрешить скрывать панель кнопок форматирования если форматирование не поддерживается</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1869"/> + <source>Hide Format Buttons bar when not supported</source> + <translation>Скрывать панель кнопок форматирования если нет поддержки форматирования</translation> + </message> </context> <context> <name>EditorSyntaxPage</name> @@ -13301,7 +13414,7 @@ <context> <name>EmailDialog</name> <message> - <location filename="../UI/EmailDialog.py" line="339"/> + <location filename="../UI/EmailDialog.ui" line="13"/> <source>Send bug report</source> <translation>Отправить сообщение об ошибке</translation> </message> @@ -13396,27 +13509,27 @@ <translation>Вы действительно хотите закрыть диалог?</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="293"/> + <location filename="../UI/EmailDialog.py" line="300"/> <source>Mail Server Password</source> <translation>Пароль к почтовому серверу</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="293"/> + <location filename="../UI/EmailDialog.py" line="300"/> <source>Enter your mail server password</source> <translation>Задайте свой пароль к почтовому серверу</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="311"/> + <location filename="../UI/EmailDialog.py" line="318"/> <source><p>Authentication failed.<br>Reason: {0}</p></source> <translation><p>Аутентификация не удалась по причине: {0}</p></translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="339"/> + <location filename="../UI/EmailDialog.py" line="346"/> <source><p>Message could not be sent.<br>Reason: {0}</p></source> <translation><p>Сообщение не может быть отправлено по причине: {0}</p></translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="357"/> + <location filename="../UI/EmailDialog.py" line="364"/> <source>Attach file</source> <translation>Прицепить файл</translation> </message> @@ -13431,107 +13544,132 @@ <message> <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="39"/> <source>Outgoing mail server (SMTP):</source> - <translation>Почтовый сервер отсылки сообщений (SMTP):</translation> + <translation>Сервер исходящих сообщений (SMTP):</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="46"/> <source>Enter the address of your mail server</source> - <translation>Задайте адрес Вашего почтового сервера</translation> + <translation>Введите адрес Вашего почтового сервера</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="124"/> + <source>Enter the port of the mail server</source> + <translation>Задайте порт почтового сервера</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/> + <source>Email address:</source> + <translation>Адрес электронной почты:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/> + <source>Enter your email address</source> + <translation>Введите адрес вашей электронной почты</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="170"/> + <source>Signature:</source> + <translation>Подпись:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="180"/> + <source>Enter your email signature</source> + <translation>Введите подпись для Вашей почты</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="104"/> + <source>Select to use TLS</source> + <translation>Использовать TLS</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="192"/> + <source>Select to authenticatate against the mail server</source> + <translation>Включить в случае необходимости аутентификации на почтовом сервере</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="195"/> + <source>Mail server needs authentication</source> + <translation>Требуется аутентификация на почтовом сервере</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="204"/> + <source>Username:</source> + <translation>Имя пользователя:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="211"/> + <source>Enter your mail server username</source> + <translation>Введите ваше имя на почтовом сервере</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="218"/> + <source>Password:</source> + <translation>Пароль:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="225"/> + <source>Enter your password for accessing the mail server</source> + <translation>Введите ваш пароль для доступа к почтовому серверу</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="235"/> + <source>Press to test the login data</source> + <translation>Тест регистрационных данных</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="238"/> + <source>Test Login</source> + <translation>Проверка логина</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/> + <source>Login Test</source> + <translation>Проверить логин</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="204"/> + <source>The login test succeeded.</source> + <translation>Проверка логина успешно выполнена.</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/> + <source><p>The login test failed.<br>Reason: {0}</p></source> + <translation><p>Ошибка проверки логина.<br> Причина: {0}</p></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/> - <source>Outgoing mail server port:</source> - <translation>Номер порта почтового сервера для отсылки сообщений:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="60"/> - <source>Enter the port of the mail server</source> - <translation>Введите номер порта на почтовом сервере</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="92"/> - <source>Email address:</source> - <translation>Адрес эл. почты:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="99"/> - <source>Enter your email address</source> - <translation>Задайте адрес вашей электронной почты</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="106"/> - <source>Signature:</source> - <translation>Подпись:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="116"/> - <source>Enter your email signature</source> - <translation>Задайте подпись к Вашему письму</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="128"/> - <source>Select to use TLS</source> - <translation>Использовать TLS</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="131"/> - <source>Use TLS</source> - <translation>Использовать TLS</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="138"/> - <source>Select to authenticatate against the mail server</source> - <translation>Включить аутентификацию для почтового сервера</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="141"/> - <source>Mail server needs authentication</source> - <translation>Почтовый сервер требует аутентификацию</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="153"/> - <source>Username:</source> - <translation>Имя пользователя:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/> - <source>Enter your mail server username</source> - <translation>Задайте ваше имя пользователя на почтовом сервере</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="173"/> - <source>Password:</source> - <translation>Пароль:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="183"/> - <source>Enter your password for accessing the mail server</source> - <translation>Задайте пароль для доступа к почтовому серверу</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="193"/> - <source>Press to test the login data</source> - <translation>Тест регистрационных данных</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="196"/> - <source>Test Login</source> - <translation>Тест входа</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/> - <source>Login Test</source> - <translation>Тест логина</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="138"/> - <source>The login test succeeded.</source> - <translation>Тест логина успешен.</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/> - <source><p>The login test failed.<br>Reason: {0}</p></source> - <translation><p>Входной тест не пройден.<br> Причина: {0}</p></translation> + <source>Encryption Method:</source> + <translation>Метод шифрования:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="81"/> + <source>Select to use no encryption</source> + <translation>Без шифрования</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="84"/> + <source>None</source> + <translation>None</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="94"/> + <source>Select to use SSL</source> + <translation>Использовать SSL</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="97"/> + <source>SSL</source> + <translation>SSL</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="107"/> + <source>TLS</source> + <translation>TLS</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="117"/> + <source>Port:</source> + <translation>Порт:</translation> </message> </context> <context> @@ -14437,12 +14575,12 @@ <context> <name>ExceptionsFilterDialog</name> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="13"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="14"/> <source>Exceptions Filter</source> <translation>Фильтр исключений</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="16"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="17"/> <source><b>Exception Filter</b> <p>This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the "Start Debugging" dialog is unchecked, no exception will be reported at all.</p> <p>Please note, that unhandled exceptions are always highlighted independent of these settings.</p></source> @@ -14451,42 +14589,42 @@ <p>Пожалуйста учтите, что необработанные исключения всегда перехватываются отладчиком, вне зависимости от настроек.</p></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="27"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="28"/> <source>List of exceptions that shall be highlighted</source> <translation>Список исключений для перехвата</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="42"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="41"/> <source>Press to add the entered exception to the list</source> - <translation>Добавить исключения в список</translation> - </message> - <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="45"/> + <translation>Добавить введенное исключения в список</translation> + </message> + <message> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="44"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="52"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="51"/> <source>Enter an exception type that shall be highlighted</source> <translation>Задайте тип исключения для перехвата</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="66"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="61"/> <source>Press to delete the selected exception from the list</source> - <translation>Удалить исключения из списка</translation> - </message> - <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="69"/> + <translation>Удалить выделенное исключение из списка</translation> + </message> + <message> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="64"/> <source>Delete</source> <translation>Удалить</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="76"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="71"/> <source>Press to delete all exceptions from the list</source> <translation>Удалить все исключения из списка</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="79"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="74"/> <source>Delete All</source> <translation>Удалить все</translation> </message> @@ -14706,12 +14844,12 @@ <translation>Уведомления</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110"/> + <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="122"/> <source>Host</source> <translation>Хост</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="111"/> + <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="127"/> <source>Permission</source> <translation>Разрешение</translation> </message> @@ -14726,7 +14864,7 @@ <translation>Удалить все</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="51"/> + <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="97"/> <source>Geolocation</source> <translation>Геолокация</translation> </message> @@ -15853,7 +15991,7 @@ <translation>Имя:</translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/> <source><no flash cookie selected></source> <translation><нет выделенных флэш-куки></translation> </message> @@ -15863,7 +16001,7 @@ <translation>Размер:</translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="122"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="137"/> <source>Origin:</source> <translation>Источник:</translation> </message> @@ -15898,7 +16036,7 @@ <translation>Удалить выбранные флэш-куки</translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="213"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="225"/> <source>Remove Cookie</source> <translation>Удалить куки</translation> </message> @@ -16327,7 +16465,7 @@ <context> <name>GreaseMonkeyAddScriptDialog</name> <message> - <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py" line="105"/> + <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.ui" line="14"/> <source>GreaseMonkey Script Installation</source> <translation>Инсталляция GreaseMonkey скрипта</translation> </message> @@ -21497,7 +21635,7 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1822"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> @@ -21547,147 +21685,147 @@ <translation>Переименование {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012"/> <source>Reverting changes</source> <translation>Откат изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1057"/> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1359"/> <source>Mercurial command</source> <translation>Mercurial: Команда</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/> <source>Pulling from a remote Mercurial repository</source> <translation>Mercurial: Затягивание (загрузка) изменений из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2022"/> <source>Pushing to a remote Mercurial repository</source> <translation>Mercurial: Передача (проталкивание) изменений в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230"/> <source>Creating branch in the Mercurial repository</source> <translation>Mercurial: Создание ветви в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259"/> <source>Showing current branch</source> <translation>Отображение текущей ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Mercurial: Проверка целостности репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403"/> <source>Showing the combined configuration settings</source> <translation>Отображение обобщенных параметров конфигурации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2427"/> <source>Showing aliases for remote repositories</source> <translation>Отображение алиасов удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2451"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2475"/> <source>Identifying project directory</source> <translation>Идентификация директории проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2604"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Файлы группы изменений Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2623"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2578"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл группы изменений Mercurial<b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2625"/> <source>Preview changegroup</source> <translation>Просмотр группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2710"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Файлы группы изменений Mercurial (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2730"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочую директорию?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная Bisect подкоманда ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2727"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial: Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2759"/> <source>Removing files from the Mercurial repository only</source> <translation>Mercurial: Удаление файлов только из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/> <source>Backing out changeset</source> <translation>Отмена набора изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> <source>Rollback last transaction</source> <translation>Откатить последнюю транзакцию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Вы действительно хотите откатить последнюю транзакцию?</translation> </message> @@ -21697,72 +21835,72 @@ <translation>Mercurial: Фиксация изменений в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> <source>Mercurial Command Server</source> <translation>Mercurial: Сервер команд</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>Mercurial: Невозможно перезапустить сервер.<br>Причина: {0}.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Mercurial: Невозможно запустить сервер.<br>Причина: {0}.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2959"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908"/> <source>Import Patch</source> <translation>Импорт патча</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> <source>Export Patches</source> <translation>Экспорт патчей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> <source>Change Phase</source> <translation>Изменить фазу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/> <source>Copy Changesets</source> <translation>Копировать набор изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> <source>Copy Changesets (Continue)</source> <translation>Копировать набор изменений (продолжение)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> <source>Add Sub-repository</source> <translation>Добавить субрепозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>Невозможно прочитать файл субрепозиториев .hgsub.<b></b>Причина {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>Файл субрепозиториев .hgsub уже содержит запись <b>{0}</b>. Отмена...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>Невозможно записать файл субрепозиториев .hgsub.<p><p>Причина: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source>Remove Sub-repositories</source> <translation>Удалить субрепозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Отсутствует файл субрепозиториев .hgsub. Отмена...</p></translation> </message> @@ -21777,157 +21915,157 @@ <translation>Фиксация влияет на файлы с несохраненными изменениями. Продолжить ли фиксацию?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Revert changes</source> <translation>Откатить изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1030"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="997"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation>Вы действительно хотите откатить все изменения в этих файлах и директориях?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Do you really want to revert all changes of the project?</source> <translation>Вы действительно хотите откатить все изменения в проекте?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> <source>Create Unversioned Archive</source> <translation>Создать неверсированный архив</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> <source>Mercurial Side-by-Side Difference</source> <translation>Mercurial: Построчный просмотр различий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл <b>{0}</b></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Tagging in the Mercurial repository</source> <translation>Mercurial: Добавление тегов в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Created new branch <{0}>.</source> <translation>Создана новая ветвь <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1133"/> <source>Current branch tip</source> <translation>Вершина текущей ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/> <source>Cancelling uncommitted merge</source> <translation>Отмена незавершённого слияния</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3614"/> <source>Mercurial Bookmark</source> <translation>Mercurial: Закладка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> <source>Delete Bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> <source>Select the bookmark to be deleted:</source> <translation>Выберите закладку для удаления:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial: Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial: Переименовать закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial: Переместить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Pull Bookmark</source> <translation>Затянуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Select the bookmark to be pulled:</source> <translation>Выберите закладку для затягивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Mercurial: Загрузка закладки из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Push Bookmark</source> <translation>Протолкнуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Select the bookmark to be push:</source> <translation>Выберите закладку для проталкивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3924"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Mercurial: Проталкивание (передача) закладки в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> <source>Re-Merge</source> <translation>Повторить слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> <source>Do you really want to re-merge these files or directories?</source> <translation>Вы действительно хотите повторить слияние этих файлов или директорий?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> <source>Do you really want to re-merge the project?</source> <translation>Вы действительно хотите повторить слияние проекта?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> <source>Re-Merging</source> <translation>Повторное слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/> <source>Marking as 'unresolved'</source> <translation>Пометить как 'неразрешенный'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> <source>Marking as 'resolved'</source> <translation>Пометить как 'разрешенный'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> <source>Delete All Backups</source> <translation>Удалить все резервные копии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation><p>Вы действительно хотите удалить все резервные bundles-пакеты, сохраненные в области резервного копирования <b>{0}</b>?</p></translation> </message> @@ -21935,7 +22073,7 @@ <context> <name>HgAddSubrepositoryDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="14"/> <source>Add Sub-repository</source> <translation>Добавить субрепозиторий</translation> </message> @@ -23116,7 +23254,7 @@ <translation>Пометить выбранные конфликты как 'разрешенные'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="73"/> <source>Resolved</source> <translation>Разрешённые</translation> </message> @@ -23126,7 +23264,7 @@ <translation>Пометить выбранные конфликты как 'неразрешенные'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="83"/> <source>Unresolved</source> <translation>Неразрешённые</translation> </message> @@ -23719,7 +23857,7 @@ <translation>Задайте поле, по которому фильтровать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="55"/> <source>Revision</source> <translation>Ревизия</translation> </message> @@ -24092,7 +24230,7 @@ <translation><p>Невозможно прочитать файл <b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="14"/> <source>Edit Plan</source> <translation>Изменение плана</translation> </message> @@ -24233,7 +24371,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="14"/> <source>Mercurial Log</source> <translation>Mercurial: Журнал</translation> </message> @@ -24273,17 +24411,17 @@ <translation>Задайте поле, по которому фильтровать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="181"/> <source>Revision</source> <translation>Ревизия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="191"/> <source>Author</source> <translation>Автор</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="201"/> <source>Message</source> <translation>Сообщение</translation> </message> @@ -24308,192 +24446,192 @@ <translation>Теги</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="285"/> <source>Action</source> <translation>Действие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="290"/> <source>Path</source> <translation>Путь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="295"/> <source>Copy from</source> <translation>Копия из</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="306"/> <source>Press to get the next bunch of log entries</source> <translation>Получить следующую порцию сообщений журнала</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="309"/> <source>&Next</source> <translation>&Далее</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="316"/> <source>Enter the limit of entries to fetch</source> <translation>Задайте максимальное количество получаемых записей </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="335"/> <source>Select to stop listing log messages at a copy or move</source> <translation>Разрешить приостановку пролистывания сообщений журнала при копировании или перемещении</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="338"/> <source>Stop on Copy/Move</source> <translation>Стоп при копировании/перемещении</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="378"/> <source>Press to generate a diff to the first parent revision</source> <translation>Генерация различий с предыдущей ревизией</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="381"/> <source>Diff to Parent &1</source> <translation>Сравнить с предком &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> <source>Press to generate a diff to the second parent revision</source> <translation>Генерация различий с предпредыдущей ревизией</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="391"/> <source>Diff to Parent &2</source> <translation>Сравнить с предком &2</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="398"/> <source>Press to compare two revisions</source> <translation>Сравнить две ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="401"/> <source>&Compare Revisions</source> <translation>&Сравнить ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="462"/> <source>Errors</source> <translation>Ошибки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="468"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Журнал ошибок Mercurial</b><p>Отображение возможных ошибок команды hg log.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="484"/> <source>Input</source> <translation>Ввод</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="474"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="506"/> <source>Press to send the input to the hg process</source> <translation>Отправить данные процессу hg</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="477"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="509"/> <source>&Send</source> <translation>&Отправить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="512"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="519"/> <source>Enter data to be sent to the hg process</source> <translation>Задайте данные, которые будут посланы процессу hg</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="526"/> <source>Select to switch the input field to password mode</source> <translation>Задать режим ввода пароля для поля ввода пароля</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="529"/> <source>&Password Mode</source> <translation>&Парольный режим</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="532"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> <source>Added</source> <translation>Добавлен</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169"/> <source>Deleted</source> <translation>Удален</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source>Modified</source> <translation>Модифицирован</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="147"/> <source>All</source> <translation>Все</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="666"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="747"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="669"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="750"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="753"/> <source>Mercurial Error</source> <translation> Mercurial: Ошибка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="990"/> <source>Process Generation Error</source> <translation>Ошибка при запуске процесса</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="990"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> <source>Mercurial Log (Incoming)</source> <translation>Mercurial: Журнал (входящие)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="77"/> <source>Mercurial Log (Outgoing)</source> <translation>Mercurial: Журнал (исходящие)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> <source>Bookmarks</source> <translation>Закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="90"/> <source>Press to refresh the list of changesets</source> <translation>Освежить список изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> <source>&Refresh</source> <translation>&Освежить</translation> </message> @@ -24503,84 +24641,84 @@ <translation>Фаза</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> <source>Change the phase of the selected revisions</source> <translation>Изменить фазу выбранных ревизий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="227"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation><b>Изменить фазу</b> <p>Изменение фазы выбранных ревизий. Выбранные ревизии должны иметь одинаковую фазу.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> <source>Change Phase</source> <translation>Изменить фазу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1898"/> <source>Copy Changesets</source> <translation>Копировать набор изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2090"/> <source>The project should be reread. Do this now?</source> <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="444"/> <source>Select to show differences side-by-side</source> <translation>Разрешить построчный показ различий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> <source>Show differences side-by-side</source> <translation>Показывать различия построчно</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="421"/> <source>Select action from menu</source> <translation>Выберите действие из меню</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> <source>Copy the selected changesets to the current branch</source> <translation>Копировать выбранные изменения в текущую ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> - <source>Tag</source> - <translation>Тег</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="204"/> - <source>Tag the selected revision</source> - <translation>Помеченная ревизия</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1773"/> - <source>Switch</source> - <translation>Переключиться</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="209"/> - <source>Switch the working directory to the selected revision</source> - <translation>Переключить рабочую директорию в выбранную ревизию</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/> + <source>Tag</source> + <translation>Тег</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="235"/> + <source>Tag the selected revision</source> + <translation>Помеченная ревизия</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1950"/> + <source>Switch</source> + <translation>Переключиться</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="240"/> + <source>Switch the working directory to the selected revision</source> + <translation>Переключить рабочую директорию в выбранную ревизию</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/> <source>Pull Large Files</source> <translation>Затянуть большие файлы</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="265"/> <source>Pull large files for selected revisions</source> <translation>Затягивать (загружать) большие файлы для выбранных ревизий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="983"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1084"/> <source>{0} (large file)</source> <translation>{0} большой файл</translation> </message> @@ -24605,354 +24743,169 @@ <translation>Перейти к следующему вхождению</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Find</source> <translation>Найти</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Filter</source> <translation>Фильтр</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> - <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></source> - <translation><table><tr><td><b>Ревизия</b></td><td>{0}</td></tr><tr><td><b>Дата</b></td><td>{1}</td></tr><tr><td><b>Автор</b></td><td>{2}</td></tr><tr><td><b>Ветвь</b></td><td>{3}</td></tr><tr><td><b>Предки</b></td><td>{4}</td></tr>{5}</table></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Теги</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Закладки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2191"/> <source>Find Commit</source> <translation>Поиск фиксации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2191"/> <source>'{0}' was not found.</source> <translation>'{0}' не найдено.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/> <source>File</source> <translation>Файл</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174"/> <source>Draft</source> <translation>Draft</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> <source>Public</source> <translation>Public</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/> <source>Secret</source> <translation>Secret</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2048"/> <source>Pull Changes</source> <translation>Затянуть изменения (pull)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="261"/> <source>Pull changes from a remote repository</source> <translation>Затягивание (загрузка) изменений из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="274"/> <source>Push Selected Changes</source> <translation>Протолкнуть выбранные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation>Протолкнуть (передать) изменения выбранной ревизии и ее предков в удаленный репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> <source>Push All Changes</source> <translation>Протолкнуть все изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/> <source>Push all changes to a remote repository</source> <translation>Проталкивание (передача) всех изменений в удаленный репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1852"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2029"/> <source>Fetch Changes</source> <translation>Получить изменения (fetch)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2090"/> <source>Strip Changesets</source> <translation>Удалить наборы изменений (strip)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> <source>Fetch changes from a remote repository</source> <translation>Получение изменений из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="291"/> <source>Strip changesets from a repository</source> <translation>Удаление наборов изменений из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="245"/> <source>Define Bookmark...</source> <translation>Определить закладку...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="248"/> <source>Bookmark the selected revision</source> <translation>Закладка выбранной ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250"/> <source>Move Bookmark...</source> <translation>Переместить закладку...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253"/> <source>Move bookmark to the selected revision</source> <translation>Перемещение закладки в выбранную ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1971"/> <source>Define Bookmark</source> <translation>Определение закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1971"/> <source>Enter bookmark name for changeset "{0}":</source> <translation>Введите имя закладки для набора изменений "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1816"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1993"/> <source>Move Bookmark</source> <translation>Перемещение закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1816"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1993"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation>Выберите закладку для перемещения в набор изменений "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1936"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation>Выберите закладку для переключения (оставьте поле пустым для использования ревизии):</translation> </message> -</context> -<context> - <name>HgLogDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="14"/> - <source>Mercurial Log</source> - <translation>Mercurial: Журнал</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="26"/> - <source>Log</source> - <translation>История ревизий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="32"/> - <source><b>Mercurial Log</b><p>This shows the output of the hg log command. By clicking on the links you may show the difference between revisions.</p></source> - <translation><b>Mercurial: Журнал </b><p>Отображение вывода команды hg log. Кликнув по ссылке Вы можете увидеть различия между ревизиями.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="61"/> - <source>Errors</source> - <translation>Ошибки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="67"/> - <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> - <translation><b>Журнал ошибок Mercurial</b><p>Отображение возможных сообщений ошибки команды hg log.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="83"/> - <source>Input</source> - <translation>Ввод</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="105"/> - <source>Press to send the input to the hg process</source> - <translation>Отправить данные процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="108"/> - <source>&Send</source> - <translation>&Отправить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="111"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="118"/> - <source>Enter data to be sent to the hg process</source> - <translation>Задайте данные, которые будут посланы процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="125"/> - <source>Select to switch the input field to password mode</source> - <translation>Задать режим ввода пароля для поля ввода пароля</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="128"/> - <source>&Password Mode</source> - <translation>&Парольный режим</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="131"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="64"/> - <source><b>Processing your request, please wait...</b></source> - <translation><b>Запрос обрабатывается, пожалуйста, ждите...</b></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="74"/> - <source>Revision</source> - <translation>Ревизия</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> - <source>Process Generation Error</source> - <translation>Ошибка при запуске процесса</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="270"/> - <source>The hg process did not finish within 30s.</source> - <translation>Процесс hg не завершился в течение 30 секунд.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> - <source>Could not start the hg executable.</source> - <translation>Невозможно запустить исполняемый файл hg.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="276"/> - <source>Mercurial Error</source> - <translation>Mercurial: Ошибка</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/> - <source>No log available for '{0}'</source> - <translation>Отсутствует в журнале запись для '{0}'</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="344"/> - <source>diff to {0}</source> - <translation>Сравнить с {0}</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="358"/> - <source>Tags: {0}<br /> -</source> - <translation>Теги: {0}<br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="364"/> - <source>Parents: {0}<br /> -</source> - <translation>Предки: {0}<br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="367"/> - <source><i>Author: {0}</i><br /> -</source> - <translation><i>Автор: {0}</i><br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="371"/> - <source><i>Date: {0}, {1}</i><br /> -</source> - <translation><i>Дата: {0}, {1}</i><br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="382"/> - <source>Added {0} (copied from {1})<br /> -</source> - <translation>Добавлено {0} (скопировано из {1})<br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="387"/> - <source>Added {0}<br /> -</source> - <translation>Добавлен: {0}<br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="393"/> - <source>Modified {0}<br /> -</source> - <translation>Модифицирован {0}<br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="399"/> - <source>Deleted {0}<br /> -</source> - <translation>Удален {0}<br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="361"/> - <source>Bookmarks: {0}<br /> -</source> - <translation>Закладки: {0}<br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="352"/> - <source>Phase: {0}<br /> -</source> - <translation>Фаза: {0}<br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="45"/> - <source>Select to show differences side-by-side</source> - <translation>Разрешить построчный показ различий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="48"/> - <source>Show differences side-by-side</source> - <translation>Показывать различия построчно</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="355"/> - <source>Branch: {0}<br /> -</source> - <translation>Ветвь: {0}<br /> -</translation> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr><tr><td><b>Children</b></td><td>{5}</td></tr>{6}</table></source> + <translation><table><tr><td><b>Ревизия</b></td><td>{0}</td></tr><tr><td><b>Дата</b></td><td>{1}</td></tr><tr><td><b>Автор</b></td><td>{2}</td></tr><tr><td><b>Ветвь</b></td><td>{3}</td></tr><tr><td><b>Предки</b></td><td>{4}</td></tr><tr><td><b>Потомки</b></td><td>{5}</td></tr>{6}</table></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <source>Press to move up in the log list</source> + <translation>Перейти выше в списке сообщений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="368"/> + <source>Press to move down in the log list</source> + <translation>Перейти ниже в списке сообщений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> + <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Последний тег</b></td><td>{0}</td></tr></translation> </message> </context> <context> @@ -25314,87 +25267,82 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="605"/> <source>Version Control</source> <translation>Контроль версий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="617"/> <source>Commit changes to repository...</source> <translation>Фиксация изменений в репозитории...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> <source>Add to repository</source> <translation>Добавить в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628"/> <source>Remove from repository (and disk)</source> <translation>Удаление из репозитория (и с диска)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Remove from repository only</source> <translation>Удалить только из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="548"/> - <source>Show log</source> - <translation>Показать историю ревизий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="552"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="544"/> <source>Show log browser</source> <translation>Показать браузер журнала</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> <source>Show status</source> <translation>Показать статус</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="343"/> <source>Show annotated file</source> <translation>Показать файл, снабжённый комментариями</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Revert changes</source> <translation>Откатить изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="663"/> <source>Select all local file entries</source> <translation>Выделить все локальные файлы</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="665"/> <source>Select all versioned file entries</source> <translation>Выделить все версированные записи файла</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> <source>Select all local directory entries</source> <translation>Выделить все локальные записи директории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="669"/> <source>Select all versioned directory entries</source> <translation>Выделить все версированные записи директории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Do you really want to remove these files from the repository?</source> <translation>Вы действительно хотите удалить эти файлы переводов из репозитория?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="539"/> <source>Copy</source> <translation>Копировать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="541"/> <source>Move</source> <translation>Переместить</translation> </message> @@ -25404,42 +25352,42 @@ <translation>Расширения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="639"/> <source>Show differences</source> <translation>Показать различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="329"/> <source>Show differences side-by-side</source> <translation>Показать различия построчно</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="651"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="643"/> <source>Show differences (extended)</source> <translation>Показать различия (подробно)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="338"/> <source>Show differences side-by-side (extended)</source> <translation>Показать различия построчно (подробно)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="653"/> <source>Conflicts resolved</source> <translation>Разрешенные конфликты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="656"/> <source>Conflicts unresolved</source> <translation>Неразрешенные конфликты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659"/> <source>Re-Merge</source> <translation>Повторить слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="672"/> <source>Configure...</source> <translation>Настроить...</translation> </message> @@ -25603,1266 +25551,1246 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> - <source>Show log</source> - <translation>Показать историю ревизий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> - <source>Show &log</source> - <translation>Показать &историю ревизий</translation> + <source>Show log browser</source> + <translation>Показать браузер журнала</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> - <source>Show the log of the local project</source> - <translation>Показать историю изменений локального проекта</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation>Отображение диалога просмотра журнала локального проекта</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> - <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation><b>Показать историю</b><p>Отображение истории изменений локального проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> - <source>Show log browser</source> - <translation>Показать браузер журнала</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>Отображение диалога просмотра журнала локального проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Показать браузер журнала</b><p>Отображение диалога просмотра журнала локального проекта. Изначально показывается ограниченное количество записей. Следующие записи могут быть получены дополнительно.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show &difference</source> <translation>Показать &различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> <source>Show the difference of the local project to the repository</source> <translation>Показать различие локального проекта и репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Показать различие ревизий проекта в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> <source>Show status</source> <translation>Показать статус</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> <source>Show the status of the local project</source> <translation>Показать статус локального проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Показать статус</b><p>Отображение статуса локального проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> <source>Show heads</source> <translation>Показать текущие версии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Show the heads of the repository</source> <translation>Показать текущие версии в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Показать текущие версии</b><p>Показать текущие версии в репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357"/> <source>Show parents</source> <translation>Показать предков</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Show the parents of the repository</source> <translation>Показать предков репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Показать предков</b><p>Показать предков репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="371"/> <source>Show tip</source> <translation>Показать вершину</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <source>Show the tip of the repository</source> + <translation>Показать вершину репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> + <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> + <translation><b>Показать вершину</b><p>Отображение вершины репозитория.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <source>Revert changes</source> + <translation>Откатить изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <source>Re&vert changes</source> + <translation>От&катить изменения</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> - <source>Show the tip of the repository</source> - <translation>Показать вершину репозитория</translation> + <source>Revert all changes made to the local project</source> + <translation>Откатить все изменения в локальном проекте</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> - <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> - <translation><b>Показать вершину</b><p>Отображение вершины репозитория.</p></translation> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation><b>Откатить изменения</b><p>Все изменения в локальном проекте будут отменены.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> - <source>Revert changes</source> - <translation>Откатить изменения</translation> + <source>Merge</source> + <translation>Слить</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> - <source>Re&vert changes</source> - <translation>От&катить изменения</translation> + <source>Mer&ge changes...</source> + <translation>С&лить изменения...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> - <source>Revert all changes made to the local project</source> - <translation>Откатить все изменения в локальном проекте</translation> + <source>Merge changes of a revision into the local project</source> + <translation>Слить изменения из ревизии с локальным проектом</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation><b>Откатить изменения</b><p>Все изменения в локальном проекте будут отменены.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> - <source>Merge</source> - <translation>Слить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> - <source>Mer&ge changes...</source> - <translation>С&лить изменения...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> - <source>Merge changes of a revision into the local project</source> - <translation>Слить изменения из ревизии с локальным проектом</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Слить</b><p>Слить изменения из ревизии с локальным проектом.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <source>Tag in repository</source> + <translation>Тег в репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <source>&Tag in repository...</source> + <translation>&Тег в репозитории...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <source>Tag the local project in the repository</source> + <translation>Тег локального проекта в репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Тег в репозитории</b><p>Теги локального проекта в репозитории.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> - <source>Tag in repository</source> - <translation>Тег в репозитории</translation> + <source>List tags</source> + <translation>Список тегов</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> - <source>&Tag in repository...</source> - <translation>&Тег в репозитории...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> - <source>Tag the local project in the repository</source> - <translation>Тег локального проекта в репозитории</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Тег в репозитории</b><p>Теги локального проекта в репозитории.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> - <source>List tags</source> - <translation>Список тегов</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags...</source> <translation>Список тегов...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> <source>List tags of the project</source> <translation>Список тегов проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Список тегов</b><p>Отображает список тегов проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>List branches</source> <translation>Список ветвей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>List branches...</source> <translation>Список ветвей...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> + <source>List branches of the project</source> + <translation>Список ветвей текущего проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Список ветвей</b><p>Отображает список ветвей текущего проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create branch</source> + <translation>Создать ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create &branch...</source> + <translation>Создать &ветвь...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> - <source>List branches of the project</source> - <translation>Список ветвей текущего проекта</translation> + <source>Create a new branch for the local project in the repository</source> + <translation>Создать новую ветвь локального проекта в репозитории</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Список ветвей</b><p>Отображает список ветвей текущего проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Create branch</source> - <translation>Создать ветвь</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Create &branch...</source> - <translation>Создать &ветвь...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> - <source>Create a new branch for the local project in the repository</source> - <translation>Создать новую ветвь локального проекта в репозитории</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Создать ветвь</b><p>Создать новую ветвь локального проекта в репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> <source>Close branch</source> <translation>Закрыть ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> <source>Close the current branch of the local project</source> <translation>Закрыть ветвь локального проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> - <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> - <translation><b>Закрыть ветвь</b><p>Закрытие ветви локального проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> - <source>Show current branch</source> - <translation>Показать текущую ветвь</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> - <source>Show the current branch of the project</source> - <translation>Отображение текущей ветви проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation><b>Показать текущую ветвь</b><p>Отображение текущей ветви проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> - <source>Switch</source> - <translation>Переключиться</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> - <source>S&witch...</source> - <translation>Пе&реключиться (switch)...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Switch the working directory to another revision</source> - <translation>Переключить рабочую директорию на другую ревизию</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> - <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> - <translation><b>Переключить</b><p>Переключение рабочей директории на другую ревизию.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source>Cleanup</source> - <translation>Очистка</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source>Cleanu&p</source> - <translation>О&чистка</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> - <source>Cleanup the local project</source> - <translation>Очистить локальный проект</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Очистка</b><p>Очистить локальный проект.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>Execute command</source> - <translation>Выполнить команду</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>E&xecute command...</source> - <translation>В&ыполнить команду...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> - <source>Execute an arbitrary Mercurial command</source> - <translation>Выполнить произвольную команду Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> - <translation><b>Выполнить команду</b><p>Открытие диалога ввода произвольной команды Mercurial.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Configure</source> - <translation>Настройка</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Configure...</source> - <translation>Настроить...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> - <source>Show the configuration dialog with the Mercurial page selected</source> - <translation>Отображение диалога настроек с выбранной страницей настроек Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> - <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> - <translation><b>Настройка</b><p>Отображение диалога настроек с выбранной страницей настроек Mercurial.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> - <source>Show paths</source> - <translation>Показать пути</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> - <source>Show paths...</source> - <translation>Показать пути...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> - <source>Show the aliases for remote repositories</source> - <translation>Алиасы для удалённых репозиториев</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation><b>Показать пути</b><p>Показать алиасы для удалённых репозиториев.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source>Verify repository</source> - <translation>Проверить репозиторий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source>Verify repository...</source> - <translation>Проверить репозиторий...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> - <source>Verify the integrity of the repository</source> - <translation>Проверить целостность репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> - <translation><b>Проверить целостность репозитория</b><p>Проверить целостность репозитория.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> - <source>Recover</source> - <translation>Восстановить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> - <source>Recover...</source> - <translation>Восстановить...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> - <source>Recover from an interrupted transaction</source> - <translation>Восстановление после прерванной транзакции</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> - <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> - <translation><b>Восстановить</b><p>Восстановление после прерванной транзакции.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> - <source>Identify</source> - <translation>Идентифицировать</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> - <source>Identify...</source> - <translation>Идентифицировать...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> - <source>Identify the project directory</source> - <translation>Идентификация директории проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> - <source><b>Identify</b><p>This identifies the project directory.</p></source> - <translation><b>Идентификация</b><p>Идентифицируйте директорию проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> - <source>Create .hgignore</source> - <translation>Создать файл .hgignore</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> - <source>Create a .hgignore file with default values</source> - <translation>Создать файл .hgignore со значениями по умолчанию</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation><b>Создать файл .hgignore</b><p>Создать файл .hgignore со значениями по умолчанию.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> - <source>Create changegroup</source> - <translation>Создать группу изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> - <source>Create changegroup...</source> - <translation>Создать группу изменений...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> - <source>Create changegroup file collecting changesets</source> - <translation>Создать файл коллекции изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> - <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> - <translation><b>Создать группу изменений</b><p>Создание файла групп изменений, содержащего выбранные наборы изменений (команда hg bundle).</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> - <source>Preview changegroup</source> - <translation>Просмотр группы изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> - <source>Preview changegroup...</source> - <translation>Просмотр группы изменений...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> - <source>Preview a changegroup file containing a collection of changesets</source> - <translation>Просмотр файла, содержащего коллекцию групп изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> - <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> - <translation><b>Просмотр групп изменений</b><p>Просмотр файла, содержащего коллекцию групп изменений.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1810"/> - <source>Apply changegroups</source> - <translation>Применить группу изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> - <source>Apply changegroups...</source> - <translation>Применить группу изменений...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> - <source>Apply one or several changegroup files</source> - <translation>Применить один или несколько файлов групп изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> - <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> - <translation><b>Применить группы изменений</b><p>Применение одного или нескольких файлов групп изменений, созданных командой 'Создать группу изменений' (команда hg unbundle).</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source>Mark as "good"</source> - <translation>Пометить как "хорошая"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source>Mark as "good"...</source> - <translation>Пометить как "хорошая"...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> - <source>Mark a selectable changeset as good</source> - <translation>Пометить выбранные изменения как "хорошие"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation><b>Пометить как "хорошие"</b><p>Пометить выбранные изменения как "хорошие".</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> - <source>Mark as "bad"</source> - <translation>Пометить как "плохая"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> - <source>Mark as "bad"...</source> - <translation>Пометить как "плохая"...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> - <source>Mark a selectable changeset as bad</source> - <translation>Пометить выбранные изменения как "плохие"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> - <translation><b>Пометить как "плохие"</b><p>Пометить выбранные изменения как "плохие".</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> - <source>Skip</source> - <translation>Пропустить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> - <source>Reset</source> - <translation>Сбросить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> - <source>Reset the bisect search data</source> - <translation>Сбросить результаты поиска Bisect</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> - <translation><b>Сбросить</b><p>Сброс результатов поиска bisect.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> - <source>Back out changeset</source> - <translation>Отмена изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> - <source>Back out changes of an earlier changeset</source> - <translation>Отмена предыдущих изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> - <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> - <translation><b>Отмена изменений</b><p>Отмена предыдущих изменений.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> - <source>Serve project repository</source> - <translation>Автономный сервер репозитория проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> - <source>Serve project repository...</source> - <translation>Автономный сервер репозитория проекта...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> - <source>Serve the project repository</source> - <translation>Запуск автономного сервера репозитория проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> - <source><b>Serve project repository</b><p>This serves the project repository.</p></source> - <translation><b>Автономный сервер репозитория проекта</b><p>Запуск автономного сервера для репозитория проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1315"/> - <source>Specials</source> - <translation>Специальные</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1324"/> - <source>Changegroup Management</source> - <translation>Управление группами изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> - <source>Bisect</source> - <translation>Bisect</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1627"/> - <source>Pull</source> - <translation>Затянуть</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/> - <source>The project should be reread. Do this now?</source> - <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> - <source>Push new branch</source> - <translation>Протолкнуть новую ветвь</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> - <source>Push the current branch of the local project as a new named branch</source> - <translation>Протолкнуть (передать) текущую ветвь локального проекта как новую именованную ветвь</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> + <translation><b>Закрыть ветвь</b><p>Закрытие ветви локального проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> + <source>Show current branch</source> + <translation>Показать текущую ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Show the current branch of the project</source> + <translation>Отображение текущей ветви проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation><b>Показать текущую ветвь</b><p>Отображение текущей ветви проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <source>Switch</source> + <translation>Переключиться</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <source>S&witch...</source> + <translation>Пе&реключиться (switch)...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <source>Switch the working directory to another revision</source> + <translation>Переключить рабочую директорию на другую ревизию</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation><b>Переключить</b><p>Переключение рабочей директории на другую ревизию.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Cleanup</source> + <translation>Очистка</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Cleanu&p</source> + <translation>О&чистка</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> + <source>Cleanup the local project</source> + <translation>Очистить локальный проект</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Очистка</b><p>Очистить локальный проект.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <source>Execute command</source> + <translation>Выполнить команду</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <source>E&xecute command...</source> + <translation>В&ыполнить команду...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <source>Execute an arbitrary Mercurial command</source> + <translation>Выполнить произвольную команду Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> + <translation><b>Выполнить команду</b><p>Открытие диалога ввода произвольной команды Mercurial.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source>Configure</source> + <translation>Настройка</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source>Configure...</source> + <translation>Настроить...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <source>Show the configuration dialog with the Mercurial page selected</source> + <translation>Отображение диалога настроек с выбранной страницей настроек Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> + <translation><b>Настройка</b><p>Отображение диалога настроек с выбранной страницей настроек Mercurial.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> + <source>Show paths</source> + <translation>Показать пути</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> + <source>Show paths...</source> + <translation>Показать пути...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> + <source>Show the aliases for remote repositories</source> + <translation>Алиасы для удалённых репозиториев</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation><b>Показать пути</b><p>Показать алиасы для удалённых репозиториев.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <source>Verify repository</source> + <translation>Проверить репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <source>Verify repository...</source> + <translation>Проверить репозиторий...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> + <source>Verify the integrity of the repository</source> + <translation>Проверить целостность репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation><b>Проверить целостность репозитория</b><p>Проверить целостность репозитория.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> + <source>Recover</source> + <translation>Восстановить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> + <source>Recover...</source> + <translation>Восстановить...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> + <source>Recover from an interrupted transaction</source> + <translation>Восстановление после прерванной транзакции</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> + <translation><b>Восстановить</b><p>Восстановление после прерванной транзакции.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> + <source>Identify</source> + <translation>Идентифицировать</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> + <source>Identify...</source> + <translation>Идентифицировать...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> + <source>Identify the project directory</source> + <translation>Идентификация директории проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <source><b>Identify</b><p>This identifies the project directory.</p></source> + <translation><b>Идентификация</b><p>Идентифицируйте директорию проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> + <source>Create .hgignore</source> + <translation>Создать файл .hgignore</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <source>Create a .hgignore file with default values</source> + <translation>Создать файл .hgignore со значениями по умолчанию</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation><b>Создать файл .hgignore</b><p>Создать файл .hgignore со значениями по умолчанию.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup</source> + <translation>Создать группу изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup...</source> + <translation>Создать группу изменений...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> + <source>Create changegroup file collecting changesets</source> + <translation>Создать файл коллекции изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> + <translation><b>Создать группу изменений</b><p>Создание файла групп изменений, содержащего выбранные наборы изменений (команда hg bundle).</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> + <source>Preview changegroup</source> + <translation>Просмотр группы изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> + <source>Preview changegroup...</source> + <translation>Просмотр группы изменений...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <source>Preview a changegroup file containing a collection of changesets</source> + <translation>Просмотр файла, содержащего коллекцию групп изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> + <translation><b>Просмотр групп изменений</b><p>Просмотр файла, содержащего коллекцию групп изменений.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1793"/> + <source>Apply changegroups</source> + <translation>Применить группу изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> + <source>Apply changegroups...</source> + <translation>Применить группу изменений...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <source>Apply one or several changegroup files</source> + <translation>Применить один или несколько файлов групп изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> + <translation><b>Применить группы изменений</b><p>Применение одного или нескольких файлов групп изменений, созданных командой 'Создать группу изменений' (команда hg unbundle).</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <source>Mark as "good"</source> + <translation>Пометить как "хорошая"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <source>Mark as "good"...</source> + <translation>Пометить как "хорошая"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> + <source>Mark a selectable changeset as good</source> + <translation>Пометить выбранные изменения как "хорошие"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation><b>Пометить как "хорошие"</b><p>Пометить выбранные изменения как "хорошие".</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> + <source>Mark as "bad"</source> + <translation>Пометить как "плохая"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> + <source>Mark as "bad"...</source> + <translation>Пометить как "плохая"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> + <source>Mark a selectable changeset as bad</source> + <translation>Пометить выбранные изменения как "плохие"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation><b>Пометить как "плохие"</b><p>Пометить выбранные изменения как "плохие".</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> + <source>Skip</source> + <translation>Пропустить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <source>Reset</source> + <translation>Сбросить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> + <source>Reset the bisect search data</source> + <translation>Сбросить результаты поиска Bisect</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <translation><b>Сбросить</b><p>Сброс результатов поиска bisect.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <source>Back out changeset</source> + <translation>Отмена изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> + <source>Back out changes of an earlier changeset</source> + <translation>Отмена предыдущих изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> + <translation><b>Отмена изменений</b><p>Отмена предыдущих изменений.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> + <source>Serve project repository</source> + <translation>Автономный сервер репозитория проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> + <source>Serve project repository...</source> + <translation>Автономный сервер репозитория проекта...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> + <source>Serve the project repository</source> + <translation>Запуск автономного сервера репозитория проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/> + <source><b>Serve project repository</b><p>This serves the project repository.</p></source> + <translation><b>Автономный сервер репозитория проекта</b><p>Запуск автономного сервера для репозитория проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1300"/> + <source>Specials</source> + <translation>Специальные</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <source>Changegroup Management</source> + <translation>Управление группами изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> + <source>Bisect</source> + <translation>Bisect</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1610"/> + <source>Pull</source> + <translation>Затянуть</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <source>The project should be reread. Do this now?</source> + <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> + <source>Push new branch</source> + <translation>Протолкнуть новую ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> + <source>Push the current branch of the local project as a new named branch</source> + <translation>Протолкнуть (передать) текущую ветвь локального проекта как новую именованную ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation><b>Протолкнуть новую ветвь</b><p>Передать текущую ветвь локального проекта как новую именованную ветвь.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Rollback last transaction</source> <translation>Откатить последнюю транзакцию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Rollback the last transaction</source> <translation>Откатить последнюю транзакцию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Extensions</source> <translation>Плагины (расширения)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Edit user configuration</source> <translation>Правка конфигурации пользователя</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Edit user configuration...</source> <translation>Правка конфигурации пользователя...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Show an editor to edit the user configuration file</source> <translation>Отображение редактора для правки конфигурации пользователя</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation><b>Правка конфигурации пользователя</b><p>Отображение редактора для правки конфигурации пользователя.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration</source> + <translation>Привка конфигурации репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration...</source> + <translation>Правка конфигурации репозитория...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <source>Show an editor to edit the repository configuration file</source> + <translation>Отображение редактора для правки конфигурации репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation><b>Правка конфигурации репозитория</b><p>Отображение редактора для правки конфигурации репозитория.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Edit repository configuration</source> - <translation>Привка конфигурации репозитория</translation> + <source>Show combined configuration settings</source> + <translation>Показать обобщенные параметры настройки</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Edit repository configuration...</source> - <translation>Правка конфигурации репозитория...</translation> + <source>Show combined configuration settings...</source> + <translation>Показать обобщенные параметры настройки...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> - <source>Show an editor to edit the repository configuration file</source> - <translation>Отображение редактора для правки конфигурации репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation><b>Правка конфигурации репозитория</b><p>Отображение редактора для правки конфигурации репозитория.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <source>Show combined configuration settings</source> - <translation>Показать обобщенные параметры настройки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <source>Show combined configuration settings...</source> - <translation>Показать обобщенные параметры настройки...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show the combined configuration settings from all configuration files</source> <translation>Показать обобщенные параметры настройки из всех конфигурационных файлов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation><b>Показать обобщенные параметры настройки</b><p>Отображение объединенных параметров настройки из всех конфигурационных файлов.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <source>Skip...</source> <translation>Пропустить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> <source>Skip a selectable changeset</source> <translation>Пропустить выбранные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation><b>Пропустить</b><p>Пропустить выбранные изменения.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1849"/> <source>Import Patch</source> <translation>Импорт патча</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> <source>Import Patch...</source> <translation>Импорт патча...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Import a patch from a patch file</source> <translation>Импортировать патч из патч-файла</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation><b>Импорт патч</b><p>Импортирование патча из патч-файла в проект.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1316"/> <source>Patch Management</source> <translation>Управление патчами</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1869"/> <source>Revert Changes</source> <translation>Откатить изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> <source>Export Patches</source> <translation>Экспорт патчей</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Export Patches...</source> + <translation>Экспорт патчей...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <source>Export revisions to patch files</source> + <translation>Экспорт ревизий в патч-файлы</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation><b>Экспорт патчей</b><p>Экспорт изменений проекта в патч-файлы.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> - <source>Export Patches...</source> - <translation>Экспорт патчей...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> - <source>Export revisions to patch files</source> - <translation>Экспорт ревизий в патч-файлы</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation><b>Экспорт патчей</b><p>Экспорт изменений проекта в патч-файлы.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase</source> <translation>Изменить фазу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Change Phase...</source> <translation>Изменить фазу...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> + <source>Change the phase of revisions</source> + <translation>Изменить фазу ревизий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation><b>Изменить фазу</b><p>Изменение фазы выбранных ревизий.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1889"/> + <source>Copy Changesets</source> + <translation>Копировать наборы изменений</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> - <source>Change the phase of revisions</source> - <translation>Изменить фазу ревизий</translation> + <source>Copies changesets from another branch</source> + <translation>Копирование в текущую ветвь наборов изменений из другой ветви</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> - <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> - <translation><b>Изменить фазу</b><p>Изменение фазы выбранных ревизий.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1906"/> - <source>Copy Changesets</source> - <translation>Копировать наборы изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> - <source>Copies changesets from another branch</source> - <translation>Копирование в текущую ветвь наборов изменений из другой ветви</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation><b>Копировать наборы изменений</b><p>Копирование в текущую рабочую директорию наборов изменений из другой ветви , сохраняются имя пользователя, дата и описание оригинальных изменений.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> + <source>Continue Copying Session</source> + <translation>Продолжить сессию копирования</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation>Продолжение последней сессии копирования (после разрешения конфликтов)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation><b>Продолжить копировать изменения</b><p>Продолжение последней сессии копирования после разрешения конфликтов.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/> + <source>Graft</source> + <translation>Graft (копировать в текущую ветвь)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <source>Copy Changesets (Continue)</source> + <translation>Копировать изменения (продолжение)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Conflicts resolved</source> + <translation>Разрешенные конфликты</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Con&flicts resolved</source> + <translation>Разрешенные кон&фликты</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation>Пометить выбранные конфликты как разрешенные</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation><b>Разрешенные конфликты</b><p>Пометка всех конфликтов локального проекта как разрешенных.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> - <source>Continue Copying Session</source> - <translation>Продолжить сессию копирования</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation>Продолжение последней сессии копирования (после разрешения конфликтов)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation><b>Продолжить копировать изменения</b><p>Продолжение последней сессии копирования после разрешения конфликтов.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1393"/> - <source>Graft</source> - <translation>Graft (копировать в текущую ветвь)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/> - <source>Copy Changesets (Continue)</source> - <translation>Копировать изменения (продолжение)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Conflicts resolved</source> - <translation>Разрешенные конфликты</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Con&flicts resolved</source> - <translation>Разрешенные кон&фликты</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation>Пометить выбранные конфликты как разрешенные</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation><b>Разрешенные конфликты</b><p>Пометка всех конфликтов локального проекта как разрешенных.</p></translation> + <source>Add</source> + <translation>Добавить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <source>Add...</source> + <translation>Добавить...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <source>Add a sub-repository</source> + <translation>Добавить субрепозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> + <translation><b>Добавить...</b><p>Добавление субрепозитория в проект.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Add</source> - <translation>Добавить</translation> + <source>Remove</source> + <translation>Удалить</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Add...</source> - <translation>Добавить...</translation> + <source>Remove...</source> + <translation>Удалить...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> - <source>Add a sub-repository</source> - <translation>Добавить субрепозиторий</translation> + <source>Remove sub-repositories</source> + <translation>Удалить субрепозитории</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> - <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> - <translation><b>Добавить...</b><p>Добавление субрепозитория в проект.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> - <source>Remove</source> - <translation>Удалить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> - <source>Remove...</source> - <translation>Удалить...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> - <source>Remove sub-repositories</source> - <translation>Удалить субрепозитории</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation><b>Удалить...</b><p>Удаление субрепозиториев из проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> <source>Sub-Repository</source> <translation>Субрепозиторий</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> + <source>Show &status...</source> + <translation>Показать &статус...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> - <source>Show &status...</source> - <translation>Показать &статус...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show Summary</source> <translation>Показать сводку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <source>Show summary...</source> <translation>Показать сводку...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> <source>Show summary information of the working directory status</source> <translation>Отображение суммарной информации о статусе рабочей директории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation><b>Показать сводку</b><p>Отображение суммарной информации о статусе рабочей директории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create unversioned archive</source> <translation>Создать неверсированный архив</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create unversioned archive...</source> <translation>Создать неверсированный архив...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> <source>Create an unversioned archive from the repository</source> <translation>Создать из репозитория неверсированный архив</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation><b>Создать неверсированный архив...</b><p>Создание из репозитория неверсированного архива.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation><b>Отмена последней транзакции</b><p>Выполняет откат последней транзакции. Транзакции используются для инкапсуляции последствий всех команд, которые создают новые наборы изменений или перемещают существующие наборы изменений в хранилище. Например, следующие команды являются транзакционными, и их последствия могут быть отменены:<ul><li>commit</li><li>import</li><li>pull</li><li>push (текущее хранилище как место назначения)</li><li>unbundle</li></ul></p><p><strong>Эта команда опасна. Пожалуйста, используйте ее с осторожностью.</strong></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/> <source>Administration</source> <translation>Администрирование</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show differences</source> <translation>Показать различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> <source>Show differences (extended)</source> <translation>Показать различия (подробно)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation><b>Показать различия</b><p>Отображение различий локального проекта относительно репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation><b>Показать различия (подробно)</b><p>Отображение различий выделеных ревизий проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> <source>Cancel uncommitted merge</source> <translation>Отменить незавершённое слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> <source>Cancel an uncommitted merge and lose all changes</source> <translation>Отменить незавершённое слияние с потерей всех изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> <translation><b>Отменить незавершённое слияние</b><p>Отмена незавершённого слияния с потерей всех изменений.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <source>List bookmarks</source> + <translation>Список закладок</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <source>List bookmarks...</source> + <translation>Список закладок...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <source>List bookmarks of the project</source> + <translation>Список закладок проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation><b>Список закладок</b><p>Отображение списка закладок текущего проекта.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>List bookmarks</source> - <translation>Список закладок</translation> + <source>Define bookmark</source> + <translation>Определить закладку</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>List bookmarks...</source> - <translation>Список закладок...</translation> + <source>Define bookmark...</source> + <translation>Определить закладку...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> - <source>List bookmarks of the project</source> - <translation>Список закладок проекта</translation> + <source>Define a bookmark for the project</source> + <translation>Определить закладку проекта</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation><b>Список закладок</b><p>Отображение списка закладок текущего проекта.</p></translation> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <translation><b>Определить закладку</b><p>Определение закладки текущего проекта.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Define bookmark</source> - <translation>Определить закладку</translation> + <source>Delete bookmark</source> + <translation>Удалить закладку</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Define bookmark...</source> - <translation>Определить закладку...</translation> + <source>Delete bookmark...</source> + <translation>Удалить закладку...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> - <source>Define a bookmark for the project</source> - <translation>Определить закладку проекта</translation> + <source>Delete a bookmark of the project</source> + <translation>Удалить закладку проекта</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation><b>Определить закладку</b><p>Определение закладки текущего проекта.</p></translation> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation><b>Удалить закладку</b><p>Удаление закладки проекта.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Delete bookmark</source> - <translation>Удалить закладку</translation> + <source>Rename bookmark</source> + <translation>Переименовать закладку</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Delete bookmark...</source> - <translation>Удалить закладку...</translation> + <source>Rename bookmark...</source> + <translation>Переименовать закладку...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <source>Delete a bookmark of the project</source> - <translation>Удалить закладку проекта</translation> + <source>Rename a bookmark of the project</source> + <translation>Переименовать закладку проекта</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation><b>Удалить закладку</b><p>Удаление закладки проекта.</p></translation> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation><b>Переименовать закладку</b><p>Переименование закладки проекта.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Rename bookmark</source> - <translation>Переименовать закладку</translation> + <source>Move bookmark</source> + <translation>Переместить закладку</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Rename bookmark...</source> - <translation>Переименовать закладку...</translation> + <source>Move bookmark...</source> + <translation>Переместить закладку...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> - <source>Rename a bookmark of the project</source> - <translation>Переименовать закладку проекта</translation> + <source>Move a bookmark of the project</source> + <translation>Переместить закладку проекта</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation><b>Переименовать закладку</b><p>Переименование закладки проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source>Move bookmark</source> - <translation>Переместить закладку</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source>Move bookmark...</source> - <translation>Переместить закладку...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> - <source>Move a bookmark of the project</source> - <translation>Переместить закладку проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation><b>Переместить закладку</b><p>Перемещение закладки проекта в другую набор изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1144"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> <source>Show incoming bookmarks</source> <translation>Показать входящие закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Show a list of incoming bookmarks</source> <translation>Показать список входящих закладок</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation><b>Показать входящие закладки</b><p>Отображение списка новых закладок, доступных в удаленном репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Pull bookmark</source> <translation>Затянуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> <source>Pull a bookmark from a remote repository</source> <translation>Затянуть (загрузить) закладку из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Затянуть закладку</b><p>Загрузка закладки из удалённого репозитория в локальный.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> <source>Show outgoing bookmarks</source> <translation>Показать исходящие закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> <source>Show a list of outgoing bookmarks</source> <translation>Показать список исходящих закладок</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation><b>Показать исходящие закладки</b><p>Отображение списка новых закладок, доступных в локальном репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/> <source>Push bookmark</source> <translation>Протолкнуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> <source>Push a bookmark to a remote repository</source> <translation>Протолкнуть закладку в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Протолкнуть закладку</b><p>Передача закладки из локального репозитория в удалённый репозиторий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> <source>Bookmarks</source> <translation>Закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> <source>Tags</source> <translation>Теги</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> <source>Branches</source> <translation>Ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>Re-Merge</source> <translation>Повторить слияние</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <source>Re-Merge all conflicting, unresolved files of the project</source> + <translation>Повторить слияние всех конфликтующих, неразрешенных файлов проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts</source> + <translation>Показать конфликты</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts...</source> + <translation>Показать конфликты...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> - <source>Re-Merge all conflicting, unresolved files of the project</source> - <translation>Повторить слияние всех конфликтующих, неразрешенных файлов проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Show conflicts</source> - <translation>Показать конфликты</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Show conflicts...</source> - <translation>Показать конфликты...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> <source>Show a dialog listing all files with conflicts</source> <translation>Отображение диалога перечисления всех файлов, содержащих конфликты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> - <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> - <translation><b>Показать конфликты</b><p>Отображение диалога перечисления все файлов, содержащих конфликты.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> - <source>Conflicts unresolved</source> - <translation>Неразрешенные конфликты</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> - <source>Mark all conflicts of the local project as unresolved</source> - <translation>Пометить все конфликты локального проекта как неразрешенные</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> - <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> - <translation><b>Неразрешенные конфликты</b><p>Маркировка всех конфликтов локального проекта как неразрешенных.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> - <source>Manage Changes</source> - <translation>Управление изменениями</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> + <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> + <translation><b>Показать конфликты</b><p>Отображение диалога перечисления все файлов, содержащих конфликты.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> + <source>Conflicts unresolved</source> + <translation>Неразрешенные конфликты</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <source>Mark all conflicts of the local project as unresolved</source> + <translation>Пометить все конфликты локального проекта как неразрешенные</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> + <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> + <translation><b>Неразрешенные конфликты</b><p>Маркировка всех конфликтов локального проекта как неразрешенных.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> + <source>Manage Changes</source> + <translation>Управление изменениями</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation><b>Повторное слияние</b><p>Повторное слияние всех конфликтующих, неразрешенных файлов проекта, без учета всех предыдущих попыток слияния.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> <source>Pull current bookmark</source> <translation>Затянуть текущую закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> <source>Pull the current bookmark from a remote repository</source> <translation>Затянуть текущую закладку из удаленного репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation><b>Затянуть текущую закладку</b><p>Получение текущей закладки из удаленного репозитория в локальный репозиторий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> <source>Push current bookmark</source> <translation>Протолкнуть текущую закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source>Push the current bookmark to a remote repository</source> <translation>Протолкнуть текущую закладку в удаленный репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation><b>Протолкнуть текущую закладку</b><p>Отправка текущей закладки из локального репозитория в удаленный репозиторий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> <source>Delete all backups</source> <translation>Удалить все резервные копии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> <source>Delete all backup bundles stored in the backup area</source> <translation>Удалить все резервные bundles-пакеты, сохраненные в области резервного копирования</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation><b>Удалить все резервные копии</b><p>Удаление всех резервных bundles-пакетов, сохраненных в области резервного копирования репозитория.</p></translation> </message> @@ -28211,7 +28139,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="313"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="14"/> <source>Mercurial Status</source> <translation>Mercurial: Статус </translation> </message> @@ -28353,37 +28281,37 @@ <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="708"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/> <source>Commit</source> <translation>Фиксация</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="877"/> <source>There are no uncommitted changes available/selected.</source> <translation>Нет доступных/выбранных нефиксированных изменений.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="772"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="775"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="772"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="775"/> <source>There are no unversioned entries available/selected.</source> <translation>Нет доступных/выбранных неверсированных элементов.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="798"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="836"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="839"/> <source>There are no missing entries available/selected.</source> <translation>Нет доступных/выбраных недостающих записей.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="836"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="839"/> <source>Revert</source> <translation>Откатить</translation> </message> @@ -28468,17 +28396,17 @@ <translation>Восстановить отсутствующие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="582"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="585"/> <source>all</source> <translation>все</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="854"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="203"/> <source>Differences</source> <translation>Различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="708"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="711"/> <source>There are no entries selected to be committed.</source> <translation>Нет выбранных записей для фиксации.</translation> </message> @@ -28508,12 +28436,12 @@ <translation>&Построчные различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="881"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="884"/> <source>Side-by-Side Diff</source> <translation>Построчные различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="881"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="884"/> <source>Only one file with uncommitted changes must be selected.</source> <translation>Должен быть выбран только один файл незафиксированных изменений.</translation> </message> @@ -29749,7 +29677,7 @@ <translation>Удалить выбранные записи</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/> + <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/> <source>&Remove</source> <translation>&Удалить</translation> </message> @@ -29929,6 +29857,42 @@ </message> </context> <context> + <name>HtmlProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/HtmlProvider.py" line="388"/> + <source>Create List</source> + <translation>Создать список</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HtmlProvider.py" line="388"/> + <source>Enter desired number of list elements:</source> + <translation>Задайте необходимое количество элементов списка:</translation> + </message> +</context> +<context> + <name>HyperlinkMarkupDialog</name> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="14"/> + <source>Insert Hyperlink</source> + <translation>Вставка гиперссылки</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="23"/> + <source>Link Text:</source> + <translation>Текст ссылки:</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="33"/> + <source>Link Target:</source> + <translation>Назначение ссылки:</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="43"/> + <source>Link Title:</source> + <translation>Заголовок ссылки:</translation> + </message> +</context> +<context> <name>IExplorerImporter</name> <message> <location filename="../WebBrowser/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="40"/> @@ -30130,1066 +30094,1091 @@ <translation>Windows Bitmap файл (*.bmp)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="128"/> + <location filename="../IconEditor/IconEditorWindow.py" line="130"/> <source>Graphic Interchange Format File (*.gif)</source> <translation>GIF файл (*.gif)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="129"/> - <source>Windows Icon File (*.ico)</source> - <translation>Файлы иконок (*.ico)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="130"/> - <source>JPEG File (*.jpg)</source> - <translation>JPEG файл (*.jpg)</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="132"/> - <source>Multiple-Image Network Graphics File (*.mng)</source> - <translation>Multiple-Image Network Graphics файл (*.mng)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="133"/> - <source>Portable Bitmap File (*.pbm)</source> - <translation>Bitmap файл (*.bmp)</translation> + <source>Windows Icon File (*.ico)</source> + <translation>Файлы иконок (*.ico)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="134"/> - <source>Paintbrush Bitmap File (*.pcx)</source> - <translation>Paintbrush Bitmap файл (*.pcx)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="135"/> - <source>Portable Graymap File (*.pgm)</source> - <translation>Graymap файл (*.pgm)</translation> + <source>JPEG File (*.jpg)</source> + <translation>JPEG файл (*.jpg)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="136"/> - <source>Portable Network Graphics File (*.png)</source> - <translation>Portable Network Graphics файл (*.png)</translation> + <source>Multiple-Image Network Graphics File (*.mng)</source> + <translation>Multiple-Image Network Graphics файл (*.mng)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="137"/> - <source>Portable Pixmap File (*.ppm)</source> - <translation>Pixmap файл (*.ppm)</translation> + <source>Portable Bitmap File (*.pbm)</source> + <translation>Bitmap файл (*.bmp)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="138"/> - <source>Silicon Graphics Image File (*.sgi)</source> - <translation>Silicon Graphics Image файл (*.sgi)</translation> + <source>Paintbrush Bitmap File (*.pcx)</source> + <translation>Paintbrush Bitmap файл (*.pcx)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="139"/> - <source>Scalable Vector Graphics File (*.svg)</source> - <translation>SVG файл (*.svg)</translation> + <source>Portable Graymap File (*.pgm)</source> + <translation>Graymap файл (*.pgm)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="140"/> + <source>Portable Network Graphics File (*.png)</source> + <translation>Portable Network Graphics файл (*.png)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="141"/> + <source>Portable Pixmap File (*.ppm)</source> + <translation>Pixmap файл (*.ppm)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="142"/> - <source>Targa Graphic File (*.tga)</source> - <translation>Targa Graphic файл (*.tga)</translation> + <source>Silicon Graphics Image File (*.sgi)</source> + <translation>Silicon Graphics Image файл (*.sgi)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="143"/> - <source>TIFF File (*.tif)</source> - <translation>TIFF файл (*.tif)</translation> + <source>Scalable Vector Graphics File (*.svg)</source> + <translation>SVG файл (*.svg)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="146"/> - <source>X11 Bitmap File (*.xbm)</source> - <translation>X11 Bitmap файл (*.xbm)</translation> + <source>Targa Graphic File (*.tga)</source> + <translation>Targa Graphic файл (*.tga)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="147"/> + <source>TIFF File (*.tif)</source> + <translation>TIFF файл (*.tif)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="151"/> + <source>X11 Bitmap File (*.xbm)</source> + <translation>X11 Bitmap файл (*.xbm)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="152"/> <source>X11 Pixmap File (*.xpm)</source> <translation>X11 Pixmap файл (*.xpm)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="158"/> + <location filename="../IconEditor/IconEditorWindow.py" line="163"/> <source>All Files (*)</source> <translation>Все файлы(*)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>New</source> <translation>Новый</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>&New</source> <translation>&Новый</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>Ctrl+N</source> <comment>File|New</comment> <translation>Ctrl+N</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="196"/> + <location filename="../IconEditor/IconEditorWindow.py" line="201"/> <source>Create a new icon</source> <translation>Создать новую иконку</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="197"/> + <location filename="../IconEditor/IconEditorWindow.py" line="202"/> <source><b>New</b><p>This creates a new icon.</p></source> <translation><b>Новый</b><p>Создать новую иконку.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="204"/> + <location filename="../IconEditor/IconEditorWindow.py" line="209"/> <source>New Window</source> <translation>Новое окно</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="204"/> - <source>New &Window</source> - <translation>&Новое окно</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="209"/> + <source>New &Window</source> + <translation>&Новое окно</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="214"/> <source>Open a new icon editor window</source> <translation>Открыть новый редактор иконок</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="211"/> + <location filename="../IconEditor/IconEditorWindow.py" line="216"/> <source><b>New Window</b><p>This opens a new icon editor window.</p></source> <translation><b>Новое окно</b><p>Открыть новый редактор иконок.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>&Open...</source> <translation>&Открыть...</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>Ctrl+O</source> <comment>File|Open</comment> <translation>Ctrl+O</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="224"/> + <location filename="../IconEditor/IconEditorWindow.py" line="229"/> <source>Open an icon file for editing</source> <translation>Открыть файл иконки для редактирования</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="225"/> + <location filename="../IconEditor/IconEditorWindow.py" line="230"/> <source><b>Open File</b><p>This opens a new icon file for editing. It pops up a file selection dialog.</p></source> <translation><b>Открыть файл</b><p>Открывает новый файл иконки для редактирования. Запускает диалог выбора файла.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>&Save</source> <translation>&Сохранить</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>Ctrl+S</source> <comment>File|Save</comment> <translation>Ctrl+S</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="239"/> + <location filename="../IconEditor/IconEditorWindow.py" line="244"/> <source>Save the current icon</source> <translation>Сохранить текущую иконку</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="240"/> + <location filename="../IconEditor/IconEditorWindow.py" line="245"/> <source><b>Save File</b><p>Save the contents of the icon editor window.</p></source> <translation><b>Сохранить файл</b><p>Сохранить текущую иконку.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Save As</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Save &As...</source> <translation>Сохранить &как...</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Shift+Ctrl+S</source> <comment>File|Save As</comment> <translation>Shift+Ctrl+S</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="253"/> + <location filename="../IconEditor/IconEditorWindow.py" line="258"/> <source>Save the current icon to a new file</source> <translation>Сохранить текущую иконку в новый файл</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="255"/> + <location filename="../IconEditor/IconEditorWindow.py" line="260"/> <source><b>Save As...</b><p>Saves the current icon to a new file.</p></source> <translation><b>Сохранить как...</b><p>Сохранить текущую иконку в новый файл.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>&Close</source> <translation>&Закрыть</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>Ctrl+W</source> <comment>File|Close</comment> <translation>Ctrl+W</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="268"/> + <location filename="../IconEditor/IconEditorWindow.py" line="273"/> <source>Close the current icon editor window</source> <translation>Закрыть текущий редактор иконок</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="270"/> + <location filename="../IconEditor/IconEditorWindow.py" line="275"/> <source><b>Close</b><p>Closes the current icon editor window.</p></source> <translation><b>Закрыть</b><p>Закрыть текущий редактор иконок.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="277"/> + <location filename="../IconEditor/IconEditorWindow.py" line="282"/> <source>Close All</source> <translation>Закрыть все</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="277"/> + <location filename="../IconEditor/IconEditorWindow.py" line="282"/> <source>Close &All</source> <translation>Закрыть &все</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="281"/> + <location filename="../IconEditor/IconEditorWindow.py" line="286"/> <source>Close all icon editor windows</source> <translation>Закрыть все редакторы иконок</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="283"/> + <location filename="../IconEditor/IconEditorWindow.py" line="288"/> <source><b>Close All</b><p>Closes all icon editor windows except the first one.</p></source> <translation><b>Закрыть все</b><p>Закрыть все редакторы иконок кроме первого.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>&Quit</source> <translation>&Выход</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>Ctrl+Q</source> <comment>File|Quit</comment> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="309"/> + <location filename="../IconEditor/IconEditorWindow.py" line="314"/> <source>Quit the icon editor</source> <translation>Закрыть редактор иконок</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="310"/> + <location filename="../IconEditor/IconEditorWindow.py" line="315"/> <source><b>Quit</b><p>Quit the icon editor.</p></source> <translation><b>Закрыть</b><p>Закрыть редактор иконок.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Undo</source> <translation>Отмена</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>&Undo</source> <translation>&Отмена</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Ctrl+Z</source> <comment>Edit|Undo</comment> <translation>Ctrl+Z</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Alt+Backspace</source> <comment>Edit|Undo</comment> <translation>Alt+Backspace</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="329"/> + <location filename="../IconEditor/IconEditorWindow.py" line="334"/> <source>Undo the last change</source> <translation>Отменить последнее изменение</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="330"/> + <location filename="../IconEditor/IconEditorWindow.py" line="335"/> <source><b>Undo</b><p>Undo the last change done.</p></source> <translation><b>Отмена</b><p>Отменить последнее изменение.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>Redo</source> <translation>Повтор</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>&Redo</source> <translation>&Повтор</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>Ctrl+Shift+Z</source> <comment>Edit|Redo</comment> <translation>Ctrl+Shift+Z</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="343"/> + <location filename="../IconEditor/IconEditorWindow.py" line="348"/> <source>Redo the last change</source> <translation>Восстановить последнее отменённое изменение</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="344"/> + <location filename="../IconEditor/IconEditorWindow.py" line="349"/> <source><b>Redo</b><p>Redo the last change done.</p></source> <translation><b>Повтор</b><p>Восстановление последнего отменённого изменения.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Cut</source> <translation>Вырезать</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Cu&t</source> <translation>В&ырезать</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Ctrl+X</source> <comment>Edit|Cut</comment> <translation>Ctrl+X</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Shift+Del</source> <comment>Edit|Cut</comment> <translation>Shift+Del</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="358"/> + <location filename="../IconEditor/IconEditorWindow.py" line="363"/> <source>Cut the selection</source> <translation>Вырезать выделение</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="359"/> + <location filename="../IconEditor/IconEditorWindow.py" line="364"/> <source><b>Cut</b><p>Cut the selected image area to the clipboard.</p></source> <translation><b>Вырезать</b><p>Переместить выделенное изображение в буфер обмена.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Copy</source> <translation>Копировать</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>&Copy</source> <translation>&Копировать</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Ctrl+C</source> <comment>Edit|Copy</comment> <translation>Ctrl+C</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Ctrl+Ins</source> <comment>Edit|Copy</comment> <translation>Ctrl+Ins</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="373"/> + <location filename="../IconEditor/IconEditorWindow.py" line="378"/> <source>Copy the selection</source> <translation>Копировать выделение</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="374"/> + <location filename="../IconEditor/IconEditorWindow.py" line="379"/> <source><b>Copy</b><p>Copy the selected image area to the clipboard.</p></source> <translation><b>Копировать</b><p>Копировать выделенное изображение в буфер обмена.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Paste</source> <translation>Вставить</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>&Paste</source> <translation>Вс&тавить</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Ctrl+V</source> <comment>Edit|Paste</comment> <translation>Ctrl+V</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Shift+Ins</source> <comment>Edit|Paste</comment> <translation>Shift+Ins</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="388"/> + <location filename="../IconEditor/IconEditorWindow.py" line="393"/> <source>Paste the clipboard image</source> <translation>Вставить изображение из буфера обмена</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="389"/> + <location filename="../IconEditor/IconEditorWindow.py" line="394"/> <source><b>Paste</b><p>Paste the clipboard image.</p></source> <translation><b>Вставить</b><p>Вставить изображение из буфера обмена.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="396"/> + <location filename="../IconEditor/IconEditorWindow.py" line="401"/> <source>Paste as New</source> <translation>Вставить как новое</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="396"/> + <location filename="../IconEditor/IconEditorWindow.py" line="401"/> <source>Paste as &New</source> <translation>Вставить как &новое</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="400"/> + <location filename="../IconEditor/IconEditorWindow.py" line="405"/> <source>Paste the clipboard image replacing the current one</source> <translation>Вставить изображение из буфера обмена вместо текущего</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="402"/> + <location filename="../IconEditor/IconEditorWindow.py" line="407"/> <source><b>Paste as New</b><p>Paste the clipboard image replacing the current one.</p></source> <translation><b>Вставить как новое</b><p>Вставить изображение из буфера обмена вместо текущего.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Clear</source> <translation>Очистить</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Cl&ear</source> <translation>О&чистить</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Alt+Shift+C</source> <comment>Edit|Clear</comment> <translation>Alt+Shift+C</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="416"/> + <location filename="../IconEditor/IconEditorWindow.py" line="421"/> <source>Clear the icon image</source> <translation>Очистить изображение иконки</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="417"/> + <location filename="../IconEditor/IconEditorWindow.py" line="422"/> <source><b>Clear</b><p>Clear the icon image and set it to be completely transparent.</p></source> <translation><b>Очистить</b><p>Очистить изображение иконки и сделать его прозрачным.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>Select All</source> <translation>Выбрать всё</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>&Select All</source> <translation>Вы&брать все</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>Ctrl+A</source> <comment>Edit|Select All</comment> <translation>Ctrl+A</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="431"/> + <location filename="../IconEditor/IconEditorWindow.py" line="436"/> <source>Select the complete icon image</source> <translation>Выберите завершённую иконку</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="433"/> + <location filename="../IconEditor/IconEditorWindow.py" line="438"/> <source><b>Select All</b><p>Selects the complete icon image.</p></source> <translation><b>Выбрать всё</b><p>Выберите завершённую иконку.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="440"/> + <location filename="../IconEditor/IconEditorWindow.py" line="445"/> <source>Change Size</source> <translation>Изменить размер</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="440"/> + <location filename="../IconEditor/IconEditorWindow.py" line="445"/> <source>Change Si&ze...</source> <translation>Изменить ра&змер...</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="446"/> + <location filename="../IconEditor/IconEditorWindow.py" line="451"/> <source>Change the icon size</source> <translation>Изменить размер иконки</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="447"/> + <location filename="../IconEditor/IconEditorWindow.py" line="452"/> <source><b>Change Size...</b><p>Changes the icon size.</p></source> <translation><b>Изменить размер...</b><p>Изменить размер иконки.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="454"/> + <location filename="../IconEditor/IconEditorWindow.py" line="459"/> <source>Grayscale</source> <translation>Оттенки серого</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="454"/> + <location filename="../IconEditor/IconEditorWindow.py" line="459"/> <source>&Grayscale</source> <translation>Оттенки &серого</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="460"/> + <location filename="../IconEditor/IconEditorWindow.py" line="465"/> <source>Change the icon to grayscale</source> <translation>Изменить цвет иконки на серый</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="462"/> + <location filename="../IconEditor/IconEditorWindow.py" line="467"/> <source><b>Grayscale</b><p>Changes the icon to grayscale.</p></source> <translation><b>Оттенки серого</b><p>Изменить цвет иконки на серый.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Zoom in</source> <translation>Увеличить масштаб</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Zoom &in</source> <translation>У&величить масштаб</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Ctrl++</source> <comment>View|Zoom in</comment> <translation>Ctrl++</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="497"/> + <location filename="../IconEditor/IconEditorWindow.py" line="502"/> <source>Zoom in on the icon</source> <translation>Увеличить масштаб</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="498"/> + <location filename="../IconEditor/IconEditorWindow.py" line="503"/> <source><b>Zoom in</b><p>Zoom in on the icon. This makes the grid bigger.</p></source> <translation><b>Увеличить масштаб</b><p>Укрупнить сетку.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Zoom out</source> <translation>Уменьшить масштаб</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Zoom &out</source> <translation>У&меньшить масштаб</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Ctrl+-</source> <comment>View|Zoom out</comment> <translation>Ctrl+-</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="511"/> + <location filename="../IconEditor/IconEditorWindow.py" line="516"/> <source>Zoom out on the icon</source> <translation>Уменьшить масштаб иконки</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="512"/> + <location filename="../IconEditor/IconEditorWindow.py" line="517"/> <source><b>Zoom out</b><p>Zoom out on the icon. This makes the grid smaller.</p></source> <translation><b>Уменьшить масштаб</b><p>Сделать сетку мельче.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Zoom reset</source> <translation>Сбросить масштаб</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Zoom &reset</source> <translation>&Сбросить масштаб</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Ctrl+0</source> <comment>View|Zoom reset</comment> <translation>Ctrl+0</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="525"/> + <location filename="../IconEditor/IconEditorWindow.py" line="530"/> <source>Reset the zoom of the icon</source> <translation>Сбросить масштаб иконки</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="527"/> + <location filename="../IconEditor/IconEditorWindow.py" line="532"/> <source><b>Zoom reset</b><p>Reset the zoom of the icon. This sets the zoom factor to 100%.</p></source> <translation><b>Сбросить масштаб</b><p>Установить масштаб 1:1.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="535"/> + <location filename="../IconEditor/IconEditorWindow.py" line="540"/> <source>Show Grid</source> <translation>Показать сетку</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="535"/> + <location filename="../IconEditor/IconEditorWindow.py" line="540"/> <source>Show &Grid</source> <translation>Показать &сетку</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="541"/> + <location filename="../IconEditor/IconEditorWindow.py" line="546"/> <source>Toggle the display of the grid</source> <translation>Переключить изображение сетки</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="543"/> + <location filename="../IconEditor/IconEditorWindow.py" line="548"/> <source><b>Show Grid</b><p>Toggle the display of the grid.</p></source> <translation><b>Показать сетку</b><p>Переключить изображение сетки.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="562"/> + <location filename="../IconEditor/IconEditorWindow.py" line="567"/> <source>Freehand</source> <translation>Произвольный рисунок</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="562"/> + <location filename="../IconEditor/IconEditorWindow.py" line="567"/> <source>&Freehand</source> <translation>&Произвольный рисунок</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="568"/> + <location filename="../IconEditor/IconEditorWindow.py" line="573"/> <source><b>Free hand</b><p>Draws non linear lines.</p></source> <translation><b>Произвольный рисунок</b><p>Рисовать произвольные линии.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="577"/> + <location filename="../IconEditor/IconEditorWindow.py" line="582"/> <source>Color Picker</source> <translation>Выбрать цвет</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="577"/> + <location filename="../IconEditor/IconEditorWindow.py" line="582"/> <source>&Color Picker</source> <translation>&Выбрать цвет</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="583"/> + <location filename="../IconEditor/IconEditorWindow.py" line="588"/> <source><b>Color Picker</b><p>The color of the pixel clicked on will become the current draw color.</p></source> <translation><b>Выбрать цвет</b><p>Этот диалог поможет выбрать цвет для рисования.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="594"/> + <location filename="../IconEditor/IconEditorWindow.py" line="599"/> <source>Rectangle</source> <translation>Прямоугольник</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="594"/> + <location filename="../IconEditor/IconEditorWindow.py" line="599"/> <source>&Rectangle</source> <translation>&Прямоугольник</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="600"/> + <location filename="../IconEditor/IconEditorWindow.py" line="605"/> <source><b>Rectangle</b><p>Draw a rectangle.</p></source> <translation><b>Прямоугольник</b><p>Рисовать прямоугольник.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="609"/> + <location filename="../IconEditor/IconEditorWindow.py" line="614"/> <source>Filled Rectangle</source> <translation>Закрашенный прямоугольник</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="609"/> + <location filename="../IconEditor/IconEditorWindow.py" line="614"/> <source>F&illed Rectangle</source> <translation>З&акрашенный прямоугольник</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="615"/> + <location filename="../IconEditor/IconEditorWindow.py" line="620"/> <source><b>Filled Rectangle</b><p>Draw a filled rectangle.</p></source> <translation><b>Закрашенный прямоугольник</b><p>Рисовать закрашенный прямоугольник.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="625"/> + <location filename="../IconEditor/IconEditorWindow.py" line="630"/> <source>Circle</source> <translation>Окружность</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="631"/> + <location filename="../IconEditor/IconEditorWindow.py" line="636"/> <source><b>Circle</b><p>Draw a circle.</p></source> <translation><b>Окружность</b><p>Рисовать окружность.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="640"/> + <location filename="../IconEditor/IconEditorWindow.py" line="645"/> <source>Filled Circle</source> <translation>Закрашенная окружность</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="640"/> + <location filename="../IconEditor/IconEditorWindow.py" line="645"/> <source>Fille&d Circle</source> <translation>Закраше&нная окружность</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="646"/> + <location filename="../IconEditor/IconEditorWindow.py" line="651"/> <source><b>Filled Circle</b><p>Draw a filled circle.</p></source> <translation><b>Закрашенная окружность</b><p>Рисовать закрашенную окружность.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="656"/> + <location filename="../IconEditor/IconEditorWindow.py" line="661"/> <source>Ellipse</source> <translation>Эллипс</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="656"/> + <location filename="../IconEditor/IconEditorWindow.py" line="661"/> <source>&Ellipse</source> <translation>&Эллипс</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="662"/> + <location filename="../IconEditor/IconEditorWindow.py" line="667"/> <source><b>Ellipse</b><p>Draw an ellipse.</p></source> <translation><b>Эллипс</b><p>Рисовать эллипс.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="671"/> + <location filename="../IconEditor/IconEditorWindow.py" line="676"/> <source>Filled Ellipse</source> <translation>Закрашенный Эллипс</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="671"/> + <location filename="../IconEditor/IconEditorWindow.py" line="676"/> <source>Fille&d Elli&pse</source> <translation>Закраш&енный Эллипс</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="677"/> + <location filename="../IconEditor/IconEditorWindow.py" line="682"/> <source><b>Filled Ellipse</b><p>Draw a filled ellipse.</p></source> <translation><b>Закрашенный Эллипс</b><p>Рисовать закрашенный эллипс.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="687"/> + <location filename="../IconEditor/IconEditorWindow.py" line="692"/> <source>Flood Fill</source> <translation>Закрашивать</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="687"/> + <location filename="../IconEditor/IconEditorWindow.py" line="692"/> <source>Fl&ood Fill</source> <translation>Закра&шивать</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="693"/> + <location filename="../IconEditor/IconEditorWindow.py" line="698"/> <source><b>Flood Fill</b><p>Fill adjoining pixels with the same color with the current color.</p></source> <translation><b>Закрашивать</b><p>Закрашивать текущим цветом.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="703"/> + <location filename="../IconEditor/IconEditorWindow.py" line="708"/> <source>Line</source> <translation>Строка</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="703"/> + <location filename="../IconEditor/IconEditorWindow.py" line="708"/> <source>&Line</source> <translation>&Линия</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="709"/> + <location filename="../IconEditor/IconEditorWindow.py" line="714"/> <source><b>Line</b><p>Draw a line.</p></source> <translation><b>Линия</b><p>Рисовать линию.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="718"/> + <location filename="../IconEditor/IconEditorWindow.py" line="723"/> <source>Eraser (Transparent)</source> <translation>Ластик</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="718"/> + <location filename="../IconEditor/IconEditorWindow.py" line="723"/> <source>Eraser (&Transparent)</source> <translation>Ласти&к</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="724"/> + <location filename="../IconEditor/IconEditorWindow.py" line="729"/> <source><b>Eraser (Transparent)</b><p>Erase pixels by setting them to transparent.</p></source> <translation><b>Ластик</b><p>Очистить пикселы.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="733"/> + <location filename="../IconEditor/IconEditorWindow.py" line="738"/> <source>Rectangular Selection</source> <translation>Прямоугольное выделение</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="750"/> + <location filename="../IconEditor/IconEditorWindow.py" line="755"/> <source>Rect&angular Selection</source> <translation>Прям&оугольное выделение</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="739"/> + <location filename="../IconEditor/IconEditorWindow.py" line="744"/> <source><b>Rectangular Selection</b><p>Select a rectangular section of the icon using the mouse.</p></source> <translation><b>Прямоугольное выделение</b><p>Выбрать прямоугольную область с помощью мышки.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="750"/> + <location filename="../IconEditor/IconEditorWindow.py" line="755"/> <source>Circular Selection</source> <translation>Выделение окружности</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="756"/> + <location filename="../IconEditor/IconEditorWindow.py" line="761"/> <source><b>Circular Selection</b><p>Select a circular section of the icon using the mouse.</p></source> <translation><b>Выделение окружности</b><p>Выбрать круглую область с помощью мышки.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="773"/> + <location filename="../IconEditor/IconEditorWindow.py" line="778"/> <source>About</source> <translation>О программе</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="773"/> + <location filename="../IconEditor/IconEditorWindow.py" line="778"/> <source>&About</source> <translation>&О программе</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="777"/> + <location filename="../IconEditor/IconEditorWindow.py" line="782"/> <source>Display information about this software</source> <translation>Информация о программе</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="779"/> + <location filename="../IconEditor/IconEditorWindow.py" line="784"/> <source><b>About</b><p>Display some information about this software.</p></source> <translation><b>О программе</b><p>Информация об этом программном продукте.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="785"/> + <location filename="../IconEditor/IconEditorWindow.py" line="790"/> <source>About Qt</source> <translation>О Qt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="785"/> + <location filename="../IconEditor/IconEditorWindow.py" line="790"/> <source>About &Qt</source> <translation>О &Qt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="789"/> + <location filename="../IconEditor/IconEditorWindow.py" line="794"/> <source>Display information about the Qt toolkit</source> <translation>Информация о библиотеке Qt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="791"/> + <location filename="../IconEditor/IconEditorWindow.py" line="796"/> <source><b>About Qt</b><p>Display some information about the Qt toolkit.</p></source> <translation><b>О Qt</b><p>Информация о библиотеке Qt.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>What's This?</source> <translation>Что это?</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>&What's This?</source> <translation>&Что это?</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>Shift+F1</source> <comment>Help|What's This?'</comment> <translation>Shift+F1</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="804"/> + <location filename="../IconEditor/IconEditorWindow.py" line="809"/> <source>Context sensitive help</source> <translation>Контекстная помощь</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="805"/> + <location filename="../IconEditor/IconEditorWindow.py" line="810"/> <source><b>Display context sensitive help</b><p>In What's This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.</p></source> <translation><b>Показать контекстную помощь</b> <p>В режиме контекстной помощи курсор мыши выглядит как стрелка со знаком вопроса, и, щёлкнув по элементу интерфейса, Вы можете просмотреть краткую справку о его роли и его использовании. В диалогах можно воспользоваться кнопкой контекстной помощи в заголовке окна.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="822"/> + <location filename="../IconEditor/IconEditorWindow.py" line="827"/> <source>&File</source> <translation>&Файл</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="839"/> + <location filename="../IconEditor/IconEditorWindow.py" line="844"/> <source>&Edit</source> <translation>&Правка</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="855"/> + <location filename="../IconEditor/IconEditorWindow.py" line="860"/> <source>&View</source> <translation>&Вид</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="863"/> + <location filename="../IconEditor/IconEditorWindow.py" line="868"/> <source>&Tools</source> <translation>&Инструменты</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="882"/> + <location filename="../IconEditor/IconEditorWindow.py" line="887"/> <source>&Help</source> <translation>&Справка</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="892"/> + <location filename="../IconEditor/IconEditorWindow.py" line="897"/> <source>File</source> <translation>Файл</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="906"/> + <location filename="../IconEditor/IconEditorWindow.py" line="911"/> <source>Edit</source> <translation>Редактировать</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="919"/> - <source>View</source> - <translation>Вид</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="924"/> + <source>View</source> + <translation>Вид</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="929"/> <source>Tools</source> <translation>Инструменты</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="942"/> + <location filename="../IconEditor/IconEditorWindow.py" line="947"/> <source>Help</source> <translation>Справка</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="956"/> + <location filename="../IconEditor/IconEditorWindow.py" line="961"/> <source><p>This part of the status bar displays the icon size.</p></source> <translation><p>В этой части строки статуса отображается размер иконки.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="963"/> + <location filename="../IconEditor/IconEditorWindow.py" line="968"/> <source><p>This part of the status bar displays the cursor position.</p></source> <translation><p>В этой части строки статуса отображается текущуая позиция курсора в редакторе.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1059"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1064"/> <source>Open icon file</source> <translation>Открыть файл иконки</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1109"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1114"/> <source>Save icon file</source> <translation>Сохранить иконку в файл</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1109"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1114"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1145"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1150"/> <source>The file '{0}' does not exist.</source> <translation>Файл {0} не существует.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1152"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1157"/> <source>Cannot read file '{0}: {1}.</source> <translation>Невозможно прочитать файл {0}: {1}.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1186"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1191"/> <source>Cannot write file '{0}: {1}.</source> <translation>Невозможно записать файл {0}: {1}.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1198"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1203"/> <source>Icon saved</source> <translation>Иконка сохранена</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1213"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1218"/> <source>Untitled</source> <translation>Без имени</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1217"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1222"/> <source>{0}[*] - {1}</source> <translation>{0}[*] - {1}</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1217"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1222"/> <source>Icon Editor</source> <translation>Редактор иконок</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1238"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1243"/> <source>The icon image has unsaved changes.</source> <translation>Изменения в иконке не сохранены.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="131"/> + <location filename="../IconEditor/IconEditorWindow.py" line="135"/> <source>JPEG File (*.jpeg)</source> <translation>JPEG файлы (*.jpg)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="140"/> - <source>Compressed Scalable Vector Graphics File (*.svgz)</source> - <translation>Сжатый SVG файл (*.svgz)</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="144"/> + <source>Compressed Scalable Vector Graphics File (*.svgz)</source> + <translation>Сжатый SVG файл (*.svgz)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="148"/> <source>TIFF File (*.tiff)</source> <translation>TIFF файл (*.tif)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="145"/> + <location filename="../IconEditor/IconEditorWindow.py" line="149"/> <source>WAP Bitmap File (*.wbmp)</source> <translation>WAP Bitmap файл (*.wbmp)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1238"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1243"/> <source>eric6 Icon Editor</source> <translation>Eric редактор иконок</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1328"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1333"/> <source>About eric6 Icon Editor</source> <translation>О редакторе иконок Eric</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1328"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1333"/> <source>The eric6 Icon Editor is a simple editor component to perform icon drawing tasks.</source> <translation>Редактор иконок Eric - это простой редактор для рисования иконок.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="290"/> + <location filename="../IconEditor/IconEditorWindow.py" line="295"/> <source>Close Others</source> <translation>Закрыть остальные</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="294"/> + <location filename="../IconEditor/IconEditorWindow.py" line="299"/> <source>Close all other icon editor windows</source> <translation>Закрыть все другие окна редактора иконок</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="296"/> + <location filename="../IconEditor/IconEditorWindow.py" line="301"/> <source><b>Close Others</b><p>Closes all other icon editor windows.</p></source> <translation><b>Закрыть другие</b><p>Закрывает все лругие окна редактора иконок.</p></translation> </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="150"/> + <source>WebP Image File (*.webp)</source> + <translation>WebP Image файл (*.webp)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="128"/> + <source>Windows Cursor File (*.cur)</source> + <translation>Windows Cursor файл (*.cur)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="129"/> + <source>DirectDraw-Surface File (*.dds)</source> + <translation>DirectDraw-Surface файл (*.dds)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="131"/> + <source>Apple Icon File (*.icns)</source> + <translation>Apple Icon файл (*.icns)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="133"/> + <source>JPEG2000 File (*.jp2)</source> + <translation>JPEG2000 файл (*.jp2)</translation> + </message> </context> <context> <name>IconSizeDialog</name> @@ -31281,6 +31270,189 @@ </message> </context> <context> + <name>ImageMarkupDialog</name> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="53"/> + <source>Windows Bitmap File (*.bmp)</source> + <translation>Windows Bitmap файл (*.bmp)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="54"/> + <source>Windows Cursor File (*.cur)</source> + <translation>Windows Cursor файл (*.cur)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="55"/> + <source>DirectDraw-Surface File (*.dds)</source> + <translation>DirectDraw-Surface файл (*.dds)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="56"/> + <source>Graphic Interchange Format File (*.gif)</source> + <translation>Graphic Interchange Format файл (*.gif)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="57"/> + <source>Apple Icon File (*.icns)</source> + <translation>Apple Icon файл (*.icns)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="58"/> + <source>Windows Icon File (*.ico)</source> + <translation>Windows Icon файл (*.ico)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="59"/> + <source>JPEG2000 File (*.jp2)</source> + <translation>JPEG2000 файл (*.jp2)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="60"/> + <source>JPEG File (*.jpg)</source> + <translation>JPEG файл (*.jpg)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="61"/> + <source>JPEG File (*.jpeg)</source> + <translation>JPEG файл (*.jpg)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="62"/> + <source>Multiple-Image Network Graphics File (*.mng)</source> + <translation>Multiple-Image Network Graphics файл (*.mng)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="63"/> + <source>Portable Bitmap File (*.pbm)</source> + <translation>Portable Bitmap файл (*.bmp)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="64"/> + <source>Paintbrush Bitmap File (*.pcx)</source> + <translation>Paintbrush Bitmap файл (*.pcx)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="65"/> + <source>Portable Graymap File (*.pgm)</source> + <translation>Graymap файл (*.pgm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="66"/> + <source>Portable Network Graphics File (*.png)</source> + <translation>Portable Network Graphics файл (*.png)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="67"/> + <source>Portable Pixmap File (*.ppm)</source> + <translation>Portable Pixmap файл (*.ppm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="68"/> + <source>Silicon Graphics Image File (*.sgi)</source> + <translation>Silicon Graphics Image файл (*.sgi)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="69"/> + <source>Scalable Vector Graphics File (*.svg)</source> + <translation>Scalable Vector Graphics файл (*.svg)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="70"/> + <source>Compressed Scalable Vector Graphics File (*.svgz)</source> + <translation>Сжатый Scalable Vector Graphics файл (*.svgz)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="72"/> + <source>Targa Graphic File (*.tga)</source> + <translation>Targa Graphic файл (*.tga)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="73"/> + <source>TIFF File (*.tif)</source> + <translation>TIFF файл (*.tif)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="74"/> + <source>TIFF File (*.tiff)</source> + <translation>TIFF файл (*.tif)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="75"/> + <source>WAP Bitmap File (*.wbmp)</source> + <translation>WAP Bitmap файл (*.wbmp)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="76"/> + <source>WebP Image File (*.webp)</source> + <translation>WebP Image файл (*.webp)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="77"/> + <source>X11 Bitmap File (*.xbm)</source> + <translation>X11 Bitmap файл (*.xbm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="78"/> + <source>X11 Pixmap File (*.xpm)</source> + <translation>X11 Pixmap файл (*.xpm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="89"/> + <source>All Files (*)</source> + <translation>Все файлы(*)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="14"/> + <source>Add Image</source> + <translation>Добавить изображение</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="25"/> + <source>Image Address:</source> + <translation>Адрес изображения:</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="41"/> + <source>Enter the image path or URL</source> + <translation>Введите путь или URL изображения</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="48"/> + <source>Title:</source> + <translation>Заголовок:</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="58"/> + <source>Alternative Text:</source> + <translation>Альтернативный текст:</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="73"/> + <source>Keep Original Size</source> + <translation>Сохранять оригинальный размер</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="80"/> + <source>Keep Aspect Ratio</source> + <translation>Сохранять степень сжатия</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="89"/> + <source>Width:</source> + <translation>Ширина:</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="119"/> + <source> px</source> + <translation> px</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="109"/> + <source>Height:</source> + <translation>Высота:</translation> + </message> +</context> +<context> <name>ImagesIcon</name> <message> <location filename="../WebBrowser/StatusBar/ImagesIcon.py" line="40"/> @@ -34153,7 +34325,7 @@ <translation>Альтернативный лексический анализатор</translation> </message> <message> - <location filename="../Project/LexerAssociationDialog.py" line="131"/> + <location filename="../Project/LexerAssociationDialog.py" line="134"/> <source>Alternative</source> <translation>Альтернативный</translation> </message> @@ -34499,490 +34671,510 @@ <translation>Makefile</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="115"/> + <location filename="../QScintilla/Lexers/__init__.py" line="119"/> <source>Pascal</source> <translation>Pascal</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="117"/> - <source>Perl</source> - <translation>Perl</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="119"/> - <source>PostScript</source> - <translation>PostScript</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="121"/> - <source>Povray</source> - <translation>Povray</translation> + <source>Perl</source> + <translation>Perl</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="123"/> + <source>PostScript</source> + <translation>PostScript</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="125"/> + <source>Povray</source> + <translation>Povray</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="127"/> <source>Properties</source> <translation>Properties</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="131"/> - <source>Ruby</source> - <translation>Ruby</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="133"/> - <source>SQL</source> - <translation>SQL</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="135"/> - <source>TCL</source> - <translation>TCL</translation> + <source>Ruby</source> + <translation>Ruby</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="137"/> - <source>TeX</source> - <translation>TeX</translation> + <source>SQL</source> + <translation>SQL</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="139"/> - <source>VHDL</source> - <translation>VHDL</translation> + <source>TCL</source> + <translation>TCL</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="141"/> - <source>XML</source> - <translation>XML</translation> + <source>TeX</source> + <translation>TeX</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="143"/> + <source>VHDL</source> + <translation>VHDL</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="145"/> + <source>XML</source> + <translation>XML</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="147"/> <source>YAML</source> <translation>YAML</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="171"/> + <location filename="../QScintilla/Lexers/__init__.py" line="175"/> <source>Pygments</source> <translation>Pygments</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="365"/> + <location filename="../QScintilla/Lexers/__init__.py" line="375"/> <source>Python Files (*.py *.py2 *.py3)</source> <translation>Файлы Python (*.py *.py2 *.py3)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="368"/> + <location filename="../QScintilla/Lexers/__init__.py" line="378"/> <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> <translation>Файлы GUI Python (*.pyw *.pyw2 *.pyw3)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="547"/> + <location filename="../QScintilla/Lexers/__init__.py" line="565"/> <source>Pyrex Files (*.pyx)</source> <translation>Файлы Pyrex (*.pyx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="550"/> + <location filename="../QScintilla/Lexers/__init__.py" line="568"/> <source>Quixote Template Files (*.ptl)</source> <translation>Файлы шаблонов Quixote (*.ptl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="553"/> + <location filename="../QScintilla/Lexers/__init__.py" line="571"/> <source>Ruby Files (*.rb)</source> <translation>Файлы Ruby (*.rb)</translation> </message> <message> + <location filename="../QScintilla/Lexers/__init__.py" line="574"/> + <source>IDL Files (*.idl)</source> + <translation>Файлы IDL (*.idl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="393"/> + <source>C Files (*.h *.c)</source> + <translation>Файлы C (*.h *.c)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="396"/> + <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> + <translation>Файлы C++ (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="586"/> + <source>C# Files (*.cs)</source> + <translation>Файлы C# (*.cs)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="402"/> + <source>HTML Files (*.html *.htm *.asp *.shtml)</source> + <translation>Файлы HTML (*.html *.htm *.asp *.shtml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="598"/> + <source>CSS Files (*.css)</source> + <translation>Файлы CSS (*.css)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="601"/> + <source>QSS Files (*.qss)</source> + <translation>Файлы QSS (*.qss)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="411"/> + <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> + <translation>Файлы PHP (*.php *.php3 *.php4 *.php5 *.phtml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="414"/> + <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> + <translation>Файлы XML (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="613"/> + <source>Qt Resource Files (*.qrc)</source> + <translation>Файлы ресурсов Qt (*.qrc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="420"/> + <source>D Files (*.d *.di)</source> + <translation>Файлы D (*.d *.di)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="622"/> + <source>Java Files (*.java)</source> + <translation>Файлы Java (*.java)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="625"/> + <source>JavaScript Files (*.js)</source> + <translation>Файлы JavaScript (*.js)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="628"/> + <source>SQL Files (*.sql)</source> + <translation>Файлы SQL (*.sql)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="631"/> + <source>Docbook Files (*.docbook)</source> + <translation>Файлы Docbook (*.docbook)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="435"/> + <source>Perl Files (*.pl *.pm *.ph)</source> + <translation>Файлы Perl (*.pl *.pm *.ph)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="640"/> + <source>Lua Files (*.lua)</source> + <translation>Файлы Lua (*.lua)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="441"/> + <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> + <translation>Файлы TeX (*.tex *.sty *.aux *.toc *.idx)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="643"/> + <source>Shell Files (*.sh)</source> + <translation>Сценарии Shell (*.sh)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="447"/> + <source>Batch Files (*.bat *.cmd)</source> + <translation>Пакетные файлы (*.bat *.cmd)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> + <source>Diff Files (*.diff *.patch)</source> + <translation>Файлы Diff (*.diff *.patch)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="453"/> + <source>Makefiles (*.mak)</source> + <translation>Правила сборки (*.mak)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="456"/> + <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> + <translation>Файлы свойств (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="667"/> + <source>Povray Files (*.pov)</source> + <translation>Файлы Povray (*.pov)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="463"/> + <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> + <translation>Файлы CMake (CMakeLists.txt *.cmake *.ctest)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="466"/> + <source>VHDL Files (*.vhd *.vhdl)</source> + <translation>Файлы VHDL (*.vhd *.vhdl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="469"/> + <source>TCL/Tk Files (*.tcl *.tk)</source> + <translation>Файлы TCL/Tk (*.tcl *.tk)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="472"/> + <source>Fortran Files (*.f90 *.f95 *.f2k)</source> + <translation>Файлы Fortran (*.f90 *.f95 *.f2k)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="475"/> + <source>Fortran77 Files (*.f *.for)</source> + <translation>Файлы Fortran77 (*.f *.for)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="478"/> + <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> + <translation>Файлы Pascal (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="694"/> + <source>PostScript Files (*.ps)</source> + <translation>Файлы PostScript (*.ps)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="484"/> + <source>YAML Files (*.yaml *.yml)</source> + <translation>Файлы YAML (*.yaml *.yml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="744"/> + <source>All Files (*)</source> + <translation>Все файлы(*)</translation> + </message> + <message> <location filename="../QScintilla/Lexers/__init__.py" line="556"/> - <source>IDL Files (*.idl)</source> - <translation>Файлы IDL (*.idl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="383"/> - <source>C Files (*.h *.c)</source> - <translation>Файлы C (*.h *.c)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="386"/> - <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> - <translation>Файлы C++ (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="568"/> - <source>C# Files (*.cs)</source> - <translation>Файлы C# (*.cs)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="392"/> - <source>HTML Files (*.html *.htm *.asp *.shtml)</source> - <translation>Файлы HTML (*.html *.htm *.asp *.shtml)</translation> + <source>Python3 Files (*.py)</source> + <translation>Файлы Python3 (*.py)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="562"/> + <source>Python3 GUI Files (*.pyw)</source> + <translation>Файлы GUI Python3 (*.pyw)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="577"/> + <source>C Files (*.c)</source> + <translation>Файлы C (*.c)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="580"/> - <source>CSS Files (*.css)</source> - <translation>Файлы CSS (*.css)</translation> + <source>C++ Files (*.cpp)</source> + <translation>Файлы C++ (*.cpp)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="583"/> - <source>QSS Files (*.qss)</source> - <translation>Файлы QSS (*.qss)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="401"/> - <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> - <translation>Файлы PHP (*.php *.php3 *.php4 *.php5 *.phtml)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="404"/> - <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> - <translation>Файлы XML (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation> + <source>C++/C Header Files (*.h)</source> + <translation>Файлы заголовков C/C++ (*.h)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="589"/> + <source>HTML Files (*.html)</source> + <translation>HTML файлы (*.html)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="592"/> + <source>PHP Files (*.php)</source> + <translation>Файлы PHP (*.php)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="595"/> - <source>Qt Resource Files (*.qrc)</source> - <translation>Файлы ресурсов Qt (*.qrc)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="410"/> - <source>D Files (*.d *.di)</source> - <translation>Файлы D (*.d *.di)</translation> + <source>ASP Files (*.asp)</source> + <translation>Файлы ASP (*.asp)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="604"/> - <source>Java Files (*.java)</source> - <translation>Файлы Java (*.java)</translation> + <source>XML Files (*.xml)</source> + <translation>Файлы XML (*.sql)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="607"/> - <source>JavaScript Files (*.js)</source> - <translation>Файлы JavaScript (*.js)</translation> + <source>XSL Files (*.xsl)</source> + <translation>Файлы XSL (*.xsl)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="610"/> - <source>SQL Files (*.sql)</source> - <translation>Файлы SQL (*.sql)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="613"/> - <source>Docbook Files (*.docbook)</source> - <translation>Файлы Docbook (*.docbook)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="425"/> - <source>Perl Files (*.pl *.pm *.ph)</source> - <translation>Файлы Perl (*.pl *.pm *.ph)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="622"/> - <source>Lua Files (*.lua)</source> - <translation>Файлы Lua (*.lua)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="431"/> - <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> - <translation>Файлы TeX (*.tex *.sty *.aux *.toc *.idx)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="625"/> - <source>Shell Files (*.sh)</source> - <translation>Сценарии Shell (*.sh)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="437"/> - <source>Batch Files (*.bat *.cmd)</source> - <translation>Пакетные файлы (*.bat *.cmd)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="440"/> - <source>Diff Files (*.diff *.patch)</source> - <translation>Файлы Diff (*.diff *.patch)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="443"/> - <source>Makefiles (*.mak)</source> - <translation>Правила сборки (*.mak)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="446"/> - <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> - <translation>Файлы свойств (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> + <source>DTD Files (*.dtd)</source> + <translation>Файлы DTD (*.dtd)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="616"/> + <source>D Files (*.d)</source> + <translation>Файлы D (*.d)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="619"/> + <source>D Interface Files (*.di)</source> + <translation>Файлы интерфейса D (*.di)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="634"/> + <source>Perl Files (*.pl)</source> + <translation>Файлы Perl (*.pl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="637"/> + <source>Perl Module Files (*.pm)</source> + <translation>Модули Perl (*.pm)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="646"/> + <source>Batch Files (*.bat)</source> + <translation>Пакетные файлы (*.bat)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="649"/> - <source>Povray Files (*.pov)</source> - <translation>Файлы Povray (*.pov)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="453"/> - <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> - <translation>Файлы CMake (CMakeLists.txt *.cmake *.ctest)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="456"/> - <source>VHDL Files (*.vhd *.vhdl)</source> - <translation>Файлы VHDL (*.vhd *.vhdl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="459"/> - <source>TCL/Tk Files (*.tcl *.tk)</source> - <translation>Файлы TCL/Tk (*.tcl *.tk)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="462"/> - <source>Fortran Files (*.f90 *.f95 *.f2k)</source> - <translation>Файлы Fortran (*.f90 *.f95 *.f2k)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="465"/> - <source>Fortran77 Files (*.f *.for)</source> - <translation>Файлы Fortran77 (*.f *.for)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="468"/> - <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> - <translation>Файлы Pascal (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</translation> + <source>TeX Files (*.tex)</source> + <translation>Файлы TeX (*.tex)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="652"/> + <source>TeX Template Files (*.sty)</source> + <translation>Файлы шаблонов TeX (*.sty)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="655"/> + <source>Diff Files (*.diff)</source> + <translation>Файлы Diff (*.diff)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="658"/> + <source>Make Files (*.mak)</source> + <translation>Правила сборки (*.mak)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="661"/> + <source>Properties Files (*.ini)</source> + <translation>Файлы свойств (*.ini)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="664"/> + <source>Configuration Files (*.cfg)</source> + <translation>Файлы конфигурации (*.cfg)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="670"/> + <source>CMake Files (CMakeLists.txt)</source> + <translation>Файлы сборки CMake (CMakeLists.txt)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="673"/> + <source>CMake Macro Files (*.cmake)</source> + <translation>Файлы макросов CMake (*.cmake)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="676"/> - <source>PostScript Files (*.ps)</source> - <translation>Файлы PostScript (*.ps)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="474"/> - <source>YAML Files (*.yaml *.yml)</source> - <translation>Файлы YAML (*.yaml *.yml)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="718"/> - <source>All Files (*)</source> - <translation>Все файлы(*)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="538"/> - <source>Python3 Files (*.py)</source> - <translation>Файлы Python3 (*.py)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="544"/> - <source>Python3 GUI Files (*.pyw)</source> - <translation>Файлы GUI Python3 (*.pyw)</translation> + <source>VHDL Files (*.vhd)</source> + <translation>Файлы VHDL (*.vhd)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="679"/> + <source>TCL Files (*.tcl)</source> + <translation>Файлы TCL (*.tcl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="682"/> + <source>Tk Files (*.tk)</source> + <translation>Файлы Tk (*.tk)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="685"/> + <source>Fortran Files (*.f95)</source> + <translation>Файлы Fortran (*.f95)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="688"/> + <source>Fortran77 Files (*.f)</source> + <translation>Файлы Fortran77 (*.f)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="691"/> + <source>Pascal Files (*.pas)</source> + <translation>Файлы Pascal (*.pas)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="697"/> + <source>YAML Files (*.yml)</source> + <translation>Файлы YAML (*.yml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="553"/> + <source>Python2 Files (*.py2)</source> + <translation>Файлы Python2 (*.py2)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="559"/> - <source>C Files (*.c)</source> - <translation>Файлы C (*.c)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="562"/> - <source>C++ Files (*.cpp)</source> - <translation>Файлы C++ (*.cpp)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="565"/> - <source>C++/C Header Files (*.h)</source> - <translation>Файлы заголовков C/C++ (*.h)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="571"/> - <source>HTML Files (*.html)</source> - <translation>HTML файлы (*.html)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="574"/> - <source>PHP Files (*.php)</source> - <translation>Файлы PHP (*.php)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="577"/> - <source>ASP Files (*.asp)</source> - <translation>Файлы ASP (*.asp)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="586"/> - <source>XML Files (*.xml)</source> - <translation>Файлы XML (*.sql)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="589"/> - <source>XSL Files (*.xsl)</source> - <translation>Файлы XSL (*.xsl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="592"/> - <source>DTD Files (*.dtd)</source> - <translation>Файлы DTD (*.dtd)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="598"/> - <source>D Files (*.d)</source> - <translation>Файлы D (*.d)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="601"/> - <source>D Interface Files (*.di)</source> - <translation>Файлы интерфейса D (*.di)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="616"/> - <source>Perl Files (*.pl)</source> - <translation>Файлы Perl (*.pl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="619"/> - <source>Perl Module Files (*.pm)</source> - <translation>Модули Perl (*.pm)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="628"/> - <source>Batch Files (*.bat)</source> - <translation>Пакетные файлы (*.bat)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="631"/> - <source>TeX Files (*.tex)</source> - <translation>Файлы TeX (*.tex)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="634"/> - <source>TeX Template Files (*.sty)</source> - <translation>Файлы шаблонов TeX (*.sty)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="637"/> - <source>Diff Files (*.diff)</source> - <translation>Файлы Diff (*.diff)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="640"/> - <source>Make Files (*.mak)</source> - <translation>Правила сборки (*.mak)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="643"/> - <source>Properties Files (*.ini)</source> - <translation>Файлы свойств (*.ini)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="646"/> - <source>Configuration Files (*.cfg)</source> - <translation>Файлы конфигурации (*.cfg)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="652"/> - <source>CMake Files (CMakeLists.txt)</source> - <translation>Файлы сборки CMake (CMakeLists.txt)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="655"/> - <source>CMake Macro Files (*.cmake)</source> - <translation>Файлы макросов CMake (*.cmake)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="658"/> - <source>VHDL Files (*.vhd)</source> - <translation>Файлы VHDL (*.vhd)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="661"/> - <source>TCL Files (*.tcl)</source> - <translation>Файлы TCL (*.tcl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="664"/> - <source>Tk Files (*.tk)</source> - <translation>Файлы Tk (*.tk)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="667"/> - <source>Fortran Files (*.f95)</source> - <translation>Файлы Fortran (*.f95)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="670"/> - <source>Fortran77 Files (*.f)</source> - <translation>Файлы Fortran77 (*.f)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="673"/> - <source>Pascal Files (*.pas)</source> - <translation>Файлы Pascal (*.pas)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="679"/> - <source>YAML Files (*.yml)</source> - <translation>Файлы YAML (*.yml)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="535"/> - <source>Python2 Files (*.py2)</source> - <translation>Файлы Python2 (*.py2)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="541"/> <source>Python2 GUI Files (*.pyw2)</source> <translation>Файлы GUI Python2 (*.pyw2)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="125"/> - <source>Python2</source> - <translation>Python2</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="127"/> - <source>Python3</source> - <translation>Python3</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="148"/> - <source>Matlab</source> - <translation>Matlab</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="148"/> - <source>Octave</source> - <translation>Octave</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="480"/> - <source>Matlab Files (*.m *.m.matlab)</source> - <translation>Файлы Matlab (*.m *.m.matlab)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="685"/> - <source>Matlab Files (*.m)</source> - <translation>Файлы Matlab (*.m)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="685"/> - <source>Octave Files (*.m.octave)</source> - <translation>Файлы Octave (*.m.octave)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="480"/> - <source>Octave Files (*.m *.m.octave)</source> - <translation>Файлы Octave (*.m *.m.octave)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="129"/> + <source>Python2</source> + <translation>Python2</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="131"/> + <source>Python3</source> + <translation>Python3</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="115"/> + <source>Matlab</source> + <translation>Matlab</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="117"/> + <source>Octave</source> + <translation>Octave</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="487"/> + <source>Matlab Files (*.m *.m.matlab)</source> + <translation>Файлы Matlab (*.m *.m.matlab)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="700"/> + <source>Matlab Files (*.m)</source> + <translation>Файлы Matlab (*.m)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="703"/> + <source>Octave Files (*.m.octave)</source> + <translation>Файлы Octave (*.m.octave)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="490"/> + <source>Octave Files (*.m *.m.octave)</source> + <translation>Файлы Octave (*.m *.m.octave)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="133"/> <source>QSS</source> <translation>QSS</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="157"/> + <location filename="../QScintilla/Lexers/__init__.py" line="153"/> <source>Gettext</source> <translation>Gettext</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="695"/> + <location filename="../QScintilla/Lexers/__init__.py" line="709"/> <source>Gettext Files (*.po)</source> <translation>Файлы Gettext (*.po)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="162"/> + <location filename="../QScintilla/Lexers/__init__.py" line="158"/> <source>CoffeeScript</source> <translation>CoffeeScript</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="702"/> + <location filename="../QScintilla/Lexers/__init__.py" line="716"/> <source>CoffeeScript Files (*.coffee)</source> <translation>Файлы CoffeeScript (*.coffee)</translation> </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="163"/> + <source>JSON</source> + <translation>JSON</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="723"/> + <source>JSON Files (*.json)</source> + <translation>JSON файлы (*.json)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="166"/> + <source>Markdown</source> + <translation>Markdown</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="728"/> + <source>Markdown Files (*.md)</source> + <translation>Markdown файлы (*.md)</translation> + </message> </context> <context> <name>LfConvertDataDialog</name> @@ -35195,6 +35387,19 @@ </message> </context> <context> + <name>MarkdownProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/MarkdownProvider.py" line="383"/> + <source>Create List</source> + <translation>Создать список</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/MarkdownProvider.py" line="383"/> + <source>Enter desired number of list elements:</source> + <translation>Задайте необходимое количество элементов списка:</translation> + </message> +</context> +<context> <name>MasterPasswordEntryDialog</name> <message> <location filename="../Preferences/ConfigurationPages/MasterPasswordEntryDialog.ui" line="14"/> @@ -35270,12 +35475,12 @@ <context> <name>McCabeChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="423"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="426"/> <source>'{0}' is too complex ({1})</source> <translation>'{0}' слишком сложно ({1})</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="425"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="428"/> <source>{0}: {1}</source> <translation>{0}: {1}</translation> </message> @@ -35303,126 +35508,111 @@ <translation>Задайте количество отображаемых сообщений журнала</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="155"/> <source>Commit</source> <translation>Фиксация</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="161"/> <source>No. of commit messages to remember:</source> <translation>Количество сохраняемых сообщений фиксации:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="168"/> <source>Enter the number of commit messages to remember</source> <translation>Задайте количество запоминаемых сообщений фиксации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="216"/> - <source>Incoming / Outgoing</source> - <translation>Входящие/Исходящие</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="222"/> - <source>Select to show the incoming and outgoing log in a log browser dialog</source> - <translation>Разрешить показ входящего и исходящего журналов в браузере</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="225"/> - <source>Use Log Browser for incoming / outgoing log</source> - <translation>Использовать браузер журналов для входящих / исходящих сообщений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="235"/> - <source>Pull</source> - <translation>Загрузки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="242"/> <source>Select to update the working directory to new tip</source> <translation>Разрешить обновление рабочей директории до новой вершины</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="236"/> + <source>Pull</source> + <translation>Загрузки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="245"/> <source>Update after pulling</source> <translation>Обновлять после затягивания (загрузки)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="334"/> <source>Edit the Mercurial configuration file</source> <translation>Редактирование файла конфигурации Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="337"/> <source>Edit configuration file</source> <translation>Редактирование файла конфигурации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="311"/> <source>Cleanup</source> <translation>Очистка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="317"/> <source>Pattern:</source> <translation>Шаблон:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="324"/> <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> <translation>Введите шаблоны имён файлов, которые будут использованы для очистки (разделённые пробелом)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="252"/> <source>Select to prefer unbundle over pull</source> <translation>Разрешить предпочтение команды Unbundle команде Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="255"/> <source><b>Prefer Unbundle</b> <p>If this option is selected, it will be checked, if a Mercurial changegroups file from a previous "Show Incoming" request exists. In this case it will be applied and deleted. Otherwise a pull request will be sent.</p></source> <translation><b>Предпочитать Unbundle</b> <p>В случае выбора этой опции Mercurial проверяет, не остался ли файл групп изменений от предыдущего запроса "Показать входящие". Если остался, то он будет применен, а затем удалён. В противном случае будет послан запрос "Pull".</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="259"/> <source>Prefer Unbundle</source> <translation>Предпочитать Unbundle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="292"/> <source>Revert</source> <translation>Откаты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="298"/> <source>Select to create a backup file (.orig) before reverting changes</source> <translation>Разрешить создание резервной копии файла (.orig) перед откатом изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="301"/> <source>Create Backup Files</source> <translation>Создавать резервные файлы</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="269"/> <source>Merge</source> <translation>Слияния</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="275"/> <source>Select to enforce usage of the Mercural internal merge tool</source> <translation>Обеспечить применение внутреннего инструмента слияния Mercural</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="278"/> <source><b>Internal Merge Tool</b> <p>Select to enforce usage of the Mercural internal merge tool,which leaves conflict markers in the file in case of conflicting changes.</p></source> <translation><b>Внутренний инструмент слияния</b> <p>Применять внутренний инструмент слияния Mercural, который оставляет маркеры конфликтов в файле в случае наличия конфликтующих изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="282"/> <source>Use internal merge with conflict markers</source> <translation>Использовать внутренний инструмент слияния</translation> </message> @@ -35457,15 +35647,25 @@ <translation>Рассматривать скрытые изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="197"/> <source>No. of commit authors to remember:</source> <translation>Количество запоминаемых авторов фиксации:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="204"/> <source>Enter the number of commit authors to remember</source> <translation>Задайте количество запоминаемых авторов фиксации</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="132"/> + <source>No. of message characters shown in list:</source> + <translation>Количество символов в сообщении, отображаемом в списке:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="139"/> + <source>Enter the number of characters of the commit message to be shown in the list</source> + <translation>Задайте количество символов в сообщении фиксации, отображаемом в списке</translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -35629,92 +35829,92 @@ <translation>Стандартные кнопки</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="40"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="219"/> <source>Apply</source> <translation>Применить</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="39"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="226"/> <source>Abort</source> <translation>Прервать</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="41"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="233"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="45"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="240"/> <source>Ignore</source> <translation>Игнорировать</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="54"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="247"/> <source>Save all</source> <translation>Сохранить всё</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="53"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="254"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="43"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="261"/> <source>Discard</source> <translation>Сбросить</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="56"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="268"/> <source>Yes to all</source> <translation>Да для всех</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="49"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="275"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="50"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="282"/> <source>Reset</source> <translation>Сбросить</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="48"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="289"/> <source>Ok</source> <translation>Ok</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="46"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="296"/> <source>No</source> <translation>Нет</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="44"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="303"/> <source>Help</source> <translation>Справка</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="47"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="310"/> <source>No to all</source> <translation>Нет для всех</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="52"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="317"/> <source>Retry</source> <translation>Повтор</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="51"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="324"/> <source>Restore defaults</source> <translation>Восстановить умолчания</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="55"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="331"/> <source>Yes</source> <translation>Да</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="42"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="338"/> <source>Close</source> <translation>Закрыть</translation> </message> @@ -36437,107 +36637,107 @@ <context> <name>MiscellaneousChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="429"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="432"/> <source>coding magic comment not found</source> <translation>кодирование магических компонентов не найдено</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="432"/> - <source>unknown encoding ({0}) found in coding magic comment</source> - <translation>неизвестный код ({0}) обнаружен в коде магических компонентов</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="435"/> - <source>copyright notice not present</source> - <translation>уведомление об авторских правах не предоставлено</translation> + <source>unknown encoding ({0}) found in coding magic comment</source> + <translation>неизвестный код ({0}) обнаружен в коде магических компонентов</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="438"/> - <source>copyright notice contains invalid author</source> - <translation>уведомление об авторских правах содержит недействительного автора</translation> + <source>copyright notice not present</source> + <translation>уведомление об авторских правах не предоставлено</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="441"/> - <source>blind except: statement</source> - <translation>слепой except: инструкция</translation> + <source>copyright notice contains invalid author</source> + <translation>уведомление об авторских правах содержит недействительного автора</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="444"/> - <source>found {0} formatter</source> - <translation>найден {0} форматтер</translation> + <source>blind except: statement</source> + <translation>слепой except: инструкция</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="447"/> - <source>format string does contain unindexed parameters</source> - <translation>строка формата действительно содержит неиндексированные параметры</translation> + <source>found {0} formatter</source> + <translation>найден {0} форматтер</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="450"/> - <source>docstring does contain unindexed parameters</source> - <translation>строка документации действительно содержит неиндексированные параметры</translation> + <source>format string does contain unindexed parameters</source> + <translation>строка формата действительно содержит неиндексированные параметры</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="453"/> - <source>other string does contain unindexed parameters</source> - <translation>другая строка действительно содержит неиндексированные параметры</translation> + <source>docstring does contain unindexed parameters</source> + <translation>строка документации действительно содержит неиндексированные параметры</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="456"/> - <source>format call uses too large index ({0})</source> - <translation>формат вызова использует слишком большой индекс ({0})</translation> + <source>other string does contain unindexed parameters</source> + <translation>другая строка действительно содержит неиндексированные параметры</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="459"/> - <source>format call uses missing keyword ({0})</source> - <translation>формат вызова использует недостающее ключевое слово ({0})</translation> + <source>format call uses too large index ({0})</source> + <translation>формат вызова использует слишком большой индекс ({0})</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="462"/> - <source>format call uses keyword arguments but no named entries</source> - <translation>формат вызова использует ключевые аргументы, но нет именованных записей</translation> + <source>format call uses missing keyword ({0})</source> + <translation>формат вызова использует недостающее ключевое слово ({0})</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="465"/> - <source>format call uses variable arguments but no numbered entries</source> - <translation>формат ячейки использует переменные аргументы, но нет пронумерованных записей</translation> + <source>format call uses keyword arguments but no named entries</source> + <translation>формат вызова использует ключевые аргументы, но нет именованных записей</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="468"/> - <source>format call uses implicit and explicit indexes together</source> - <translation>формат вызова использует скрытые и явные индексы вместе</translation> + <source>format call uses variable arguments but no numbered entries</source> + <translation>формат ячейки использует переменные аргументы, но нет пронумерованных записей</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="471"/> - <source>format call provides unused index ({0})</source> - <translation>формат вызова предоставляет неиспользованный индекс ({0})</translation> + <source>format call uses implicit and explicit indexes together</source> + <translation>формат вызова использует скрытые и явные индексы вместе</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="474"/> - <source>format call provides unused keyword ({0})</source> - <translation>Формат вызова предоставляет неиспользованное ключевое слово ({0})</translation> + <source>format call provides unused index ({0})</source> + <translation>формат вызова предоставляет неиспользованный индекс ({0})</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="477"/> - <source>expected these __future__ imports: {0}; but only got: {1}</source> - <translation>ожидался __future__ imports: {0}; получены только: {1}</translation> + <source>format call provides unused keyword ({0})</source> + <translation>Формат вызова предоставляет неиспользованное ключевое слово ({0})</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="480"/> - <source>expected these __future__ imports: {0}; but got none</source> - <translation>ожидался __future__ imports: {0}; не получено ничего</translation> + <source>expected these __future__ imports: {0}; but only got: {1}</source> + <translation>ожидался __future__ imports: {0}; получены только: {1}</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="483"/> - <source>print statement found</source> - <translation>обнаружен оператор печати</translation> + <source>expected these __future__ imports: {0}; but got none</source> + <translation>ожидался __future__ imports: {0}; не получено ничего</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="486"/> - <source>one element tuple found</source> - <translation>один элемент кортежа найден</translation> + <source>print statement found</source> + <translation>обнаружен оператор печати</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="489"/> + <source>one element tuple found</source> + <translation>один элемент кортежа найден</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="492"/> <source>{0}: {1}</source> <translation>{0}: {1}</translation> </message> @@ -36930,72 +37130,72 @@ <context> <name>NamingStyleChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="378"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> <source>class names should use CapWords convention</source> <translation>имена классов должны использовать CapWords соглашение</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> - <source>function name should be lowercase</source> - <translation>имена функций должны быть в нижнем регистре</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="384"/> - <source>argument name should be lowercase</source> - <translation>имена парамеров должны быть в нижнем регистре</translation> + <source>function name should be lowercase</source> + <translation>имена функций должны быть в нижнем регистре</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="387"/> - <source>first argument of a class method should be named 'cls'</source> - <translation>первый параметр метода класса должен быть 'cls'</translation> + <source>argument name should be lowercase</source> + <translation>имена парамеров должны быть в нижнем регистре</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="390"/> - <source>first argument of a method should be named 'self'</source> - <translation>первый параметр метода должен быть 'self'</translation> + <source>first argument of a class method should be named 'cls'</source> + <translation>первый параметр метода класса должен быть 'cls'</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="393"/> + <source>first argument of a method should be named 'self'</source> + <translation>первый параметр метода должен быть 'self'</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="396"/> <source>first argument of a static method should not be named 'self' or 'cls</source> <translation>первый параметр статического метода класса не должен быть 'cls' или 'self'</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="397"/> - <source>module names should be lowercase</source> - <translation>имена модулей должны быть в нижнем регистре</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="400"/> - <source>package names should be lowercase</source> - <translation>имена пакетов должны быть в нижнем регистре</translation> + <source>module names should be lowercase</source> + <translation>имена модулей должны быть в нижнем регистре</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="403"/> - <source>constant imported as non constant</source> - <translation>константа импортирована как не константа</translation> + <source>package names should be lowercase</source> + <translation>имена пакетов должны быть в нижнем регистре</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="406"/> - <source>lowercase imported as non lowercase</source> - <translation>имена в нижнем регистре импортированы не в нижнем регистре</translation> + <source>constant imported as non constant</source> + <translation>константа импортирована как не константа</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="409"/> - <source>camelcase imported as lowercase</source> - <translation>имена в camelcase импортированы в нижнем регистре</translation> + <source>lowercase imported as non lowercase</source> + <translation>имена в нижнем регистре импортированы не в нижнем регистре</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="412"/> - <source>camelcase imported as constant</source> - <translation>имена в camelcase импортированы как константы</translation> + <source>camelcase imported as lowercase</source> + <translation>имена в camelcase импортированы в нижнем регистре</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="415"/> - <source>variable in function should be lowercase</source> - <translation>имена переменных в функции должны быть в нижнем регистре</translation> + <source>camelcase imported as constant</source> + <translation>имена в camelcase импортированы как константы</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="418"/> + <source>variable in function should be lowercase</source> + <translation>имена переменных в функции должны быть в нижнем регистре</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="421"/> <source>names 'l', 'O' and 'I' should be avoided</source> <translation>имена 'l', 'O' и 'I' следует избегать</translation> </message> @@ -37426,7 +37626,7 @@ <context> <name>NoCacheHostsDialog</name> <message> - <location filename="../Helpviewer/Network/NoCacheHostsDialog.py" line="52"/> + <location filename="../Helpviewer/Network/NoCacheHostsDialog.ui" line="14"/> <source>Not Cached Hosts</source> <translation>Некэшированные хосты</translation> </message> @@ -37534,7 +37734,7 @@ <translation>Задать координаты визуально</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NotificationsPage.py" line="81"/> + <location filename="../Preferences/ConfigurationPages/NotificationsPage.ui" line="146"/> <source>Visual Selection</source> <translation>Визуальный выбор</translation> </message> @@ -38207,7 +38407,7 @@ <context> <name>PasswordsDialog</name> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="91"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.ui" line="14"/> <source>Saved Passwords</source> <translation>Сохранённые пароли</translation> </message> @@ -39048,12 +39248,12 @@ <message> <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="152"/> <source>Always</source> - <translation type="unfinished">Всегда</translation> + <translation>Всегда</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="149"/> <source>Select to check for updates whenever eric is started</source> - <translation type="unfinished"></translation> + <translation>Разрешить проверку обновления всегда при запуске eric</translation> </message> </context> <context> @@ -39376,27 +39576,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1525"/> + <location filename="../Preferences/__init__.py" line="1530"/> <source>Export Preferences</source> <translation>Экспорт предпочтений</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1553"/> + <location filename="../Preferences/__init__.py" line="1558"/> <source>Import Preferences</source> <translation>Импорт предпочтений</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1553"/> + <location filename="../Preferences/__init__.py" line="1558"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Файлы свойств (*.ini);;Все файлы (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1655"/> + <location filename="../Preferences/__init__.py" line="1660"/> <source>Select Python{0} Interpreter</source> <translation>Задайте интерпретатор Python{0}</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1655"/> + <location filename="../Preferences/__init__.py" line="1660"/> <source>Select the Python{0} interpreter to be used:</source> <translation>Задайте интерпретатор Python{0}:</translation> </message> @@ -39422,7 +39622,7 @@ <translation><p>Предварительный просмотр не доступен для этого типа файла.</p></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="572"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="565"/> <source><p>ReStructuredText preview requires the <b>python-docutils</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pypi.python.org/pypi/docutils">this page.</a></p></source> <translation><p>Для предварительного просмотра ReStructuredText файлов необходим пакет <b>python-docutils</b> package.<br/>Установите его с помощью менеджера пакетов, 'pip install docutils' или ознакомьтесь со страницей <a href="http://pypi.python.org/pypi/docutils">.</a></p></translation> </message> @@ -39432,9 +39632,9 @@ <translation><p>Для предварительного просмотра ReStructuredText файлов необходим пакет <b>sphinx</b> package.<br/>Установите его с помощью менеджера пакетов,'pip install Sphinx' или ознакомьтесь со срраницей <a href="http://pypi.python.org/pypi/Sphinx">.</a></p><p>В качестве альтернативы можете запретить использование Sphinx во вкладке Редактор, страница Настройка режима работы с файлами.</p></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="597"/> - <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> - <translation><p>Для предварительного просмотра Markdown файлов необходим пакет <b>python-markdown</b>. Установите его с помощью менеджера пакетов или ознакомьтесь с инструкцией по установке <a href="http://pythonhosted.org/Markdown/install.html">.</a></p></translation> + <location filename="../UI/Previewers/PreviewerHTML.py" line="590"/> + <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> + <translation><p>Для предварительного просмотра Markdown файлов необходим пакет <b>python-markdown</b>.<br/>Установите его с помощью команды 'pip install docutils' вашего менеджера пакетов или ознакомьтесь с инструкцией <a href="http://pythonhosted.org/Markdown/install.html">.</a></p></translation> </message> </context> <context> @@ -39460,17 +39660,17 @@ <translation>Разрешить Server Side Includes</translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="177"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="179"/> <source><p>No preview available for this type of file.</p></source> <translation><p>Предварительный просмотр не доступен для этого типа файла.</p></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="225"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="230"/> <source>Preview - {0}</source> <translation>Предварительный просмотр - {0}</translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="227"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="232"/> <source>Preview</source> <translation>Предварительный просмотр</translation> </message> @@ -39849,327 +40049,327 @@ <translation>Регистрация типа проекта</translation> </message> <message> - <location filename="../Project/Project.py" line="715"/> + <location filename="../Project/Project.py" line="735"/> <source>Read project file</source> <translation>Загрузить файл проекта</translation> </message> <message> - <location filename="../Project/Project.py" line="715"/> + <location filename="../Project/Project.py" line="735"/> <source><p>The project file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл проекта: <b>{0}</b></p></translation> </message> <message> - <location filename="../Project/Project.py" line="815"/> + <location filename="../Project/Project.py" line="835"/> <source>Save project file</source> <translation>Сохранить файл проекта</translation> </message> <message> - <location filename="../Project/Project.py" line="815"/> + <location filename="../Project/Project.py" line="835"/> <source><p>The project file <b>{0}</b> could not be written.</p></source> <translation><p>Невозможно сохранить файл проекта: <b>{0}</b></p></translation> </message> <message> - <location filename="../Project/Project.py" line="851"/> + <location filename="../Project/Project.py" line="871"/> <source>Read user project properties</source> <translation>Прочитать пользовательские настройки проекта</translation> </message> <message> - <location filename="../Project/Project.py" line="851"/> + <location filename="../Project/Project.py" line="871"/> <source><p>The user specific project properties file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл пользовательских настроек <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="875"/> + <location filename="../Project/Project.py" line="895"/> <source>Save user project properties</source> <translation>Сохранить пользовательские свойства проекта</translation> </message> <message> - <location filename="../Project/Project.py" line="875"/> + <location filename="../Project/Project.py" line="895"/> <source><p>The user specific project properties file <b>{0}</b> could not be written.</p></source> <translation><p>Невозможно записать файл пользовательских настроек <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="933"/> + <location filename="../Project/Project.py" line="953"/> <source>Read project session</source> <translation>Загрузить сессию проекта</translation> </message> <message> - <location filename="../Project/Project.py" line="1155"/> + <location filename="../Project/Project.py" line="1175"/> <source>Please save the project first.</source> <translation>Пожалуйста, сначала сохраните проект.</translation> </message> <message> - <location filename="../Project/Project.py" line="933"/> + <location filename="../Project/Project.py" line="953"/> <source><p>The project session file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл с сессией проекта: <b>{0}</b></p></translation> </message> <message> - <location filename="../Project/Project.py" line="969"/> + <location filename="../Project/Project.py" line="989"/> <source>Save project session</source> <translation>Сохранить сессию проекта</translation> </message> <message> - <location filename="../Project/Project.py" line="969"/> + <location filename="../Project/Project.py" line="989"/> <source><p>The project session file <b>{0}</b> could not be written.</p></source> <translation><p>Невозможно сохранить файл с сессией проекта: <b>{0}</b></p></translation> </message> <message> - <location filename="../Project/Project.py" line="998"/> + <location filename="../Project/Project.py" line="1018"/> <source>Delete project session</source> <translation>Удалить сессию проекта</translation> </message> <message> - <location filename="../Project/Project.py" line="998"/> + <location filename="../Project/Project.py" line="1018"/> <source><p>The project session file <b>{0}</b> could not be deleted.</p></source> <translation><p>Невозможно удалить выбранный файл с сессией: <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1032"/> - <source>Read tasks</source> - <translation>Прочитать задачи</translation> - </message> - <message> - <location filename="../Project/Project.py" line="1032"/> - <source><p>The tasks file <b>{0}</b> could not be read.</p></source> - <translation><p>Невозможно прочитать файл с задачами: <b>{0}</b></p></translation> - </message> - <message> <location filename="../Project/Project.py" line="1052"/> - <source>Save tasks</source> - <translation>Сохранить задачи</translation> + <source>Read tasks</source> + <translation>Прочитать задачи</translation> </message> <message> <location filename="../Project/Project.py" line="1052"/> + <source><p>The tasks file <b>{0}</b> could not be read.</p></source> + <translation><p>Невозможно прочитать файл с задачами: <b>{0}</b></p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="1072"/> + <source>Save tasks</source> + <translation>Сохранить задачи</translation> + </message> + <message> + <location filename="../Project/Project.py" line="1072"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation><p>Невозможно сохранить файл с задачами: <b>{0}</b></p></translation> </message> <message> - <location filename="../Project/Project.py" line="1109"/> + <location filename="../Project/Project.py" line="1129"/> <source>Read debugger properties</source> <translation>Прочитать свойства отладчика</translation> </message> <message> - <location filename="../Project/Project.py" line="1109"/> + <location filename="../Project/Project.py" line="1129"/> <source><p>The project debugger properties file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл свойств отладчика <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1143"/> + <location filename="../Project/Project.py" line="1163"/> <source>Save debugger properties</source> <translation>Сохранить свойства отладчика</translation> </message> <message> - <location filename="../Project/Project.py" line="1143"/> + <location filename="../Project/Project.py" line="1163"/> <source><p>The project debugger properties file <b>{0}</b> could not be written.</p></source> <translation><p>Невозможно сохранить файл свойств отладчика <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1169"/> + <location filename="../Project/Project.py" line="1189"/> <source>Delete debugger properties</source> <translation>Удалить свойства отладчика</translation> </message> <message> - <location filename="../Project/Project.py" line="1169"/> + <location filename="../Project/Project.py" line="1189"/> <source><p>The project debugger properties file <b>{0}</b> could not be deleted.</p></source> <translation><p>Невозможно удалить файл свойств отладчика <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1277"/> + <location filename="../Project/Project.py" line="1297"/> <source>Add Language</source> <translation>Добавить язык перевода</translation> </message> <message> - <location filename="../Project/Project.py" line="1277"/> + <location filename="../Project/Project.py" line="1297"/> <source>You have to specify a translation pattern first.</source> <translation>Необходимо сначала задать шаблон перевода.</translation> </message> <message> - <location filename="../Project/Project.py" line="1399"/> + <location filename="../Project/Project.py" line="1419"/> <source>Delete translation</source> <translation>Удалить перевод</translation> </message> <message> - <location filename="../Project/Project.py" line="1399"/> + <location filename="../Project/Project.py" line="1419"/> <source><p>The selected translation file <b>{0}</b> could not be deleted.</p></source> <translation><p>Невозможно удалить выбранный файл с переводом: <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1550"/> + <location filename="../Project/Project.py" line="1570"/> <source>Add file</source> <translation>Добавить файл</translation> </message> <message> - <location filename="../Project/Project.py" line="1612"/> + <location filename="../Project/Project.py" line="1632"/> <source><p>The file <b>{0}</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1538"/> + <location filename="../Project/Project.py" line="1558"/> <source><p>The selected file <b>{0}</b> could not be added to <b>{1}</b>.</p><p>Reason: {2}</p></source> <translation><p>Невозможно добавить выделенный файл <b>{0}</b> в архив <b>{1}</b>. </p><p>Причина: {2}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1667"/> + <location filename="../Project/Project.py" line="1687"/> <source>The target directory must not be empty.</source> <translation>Целевая директория не должна быть пустой.</translation> </message> <message> - <location filename="../Project/Project.py" line="1678"/> + <location filename="../Project/Project.py" line="1698"/> <source>Add directory</source> <translation>Добавление директории</translation> </message> <message> - <location filename="../Project/Project.py" line="1581"/> + <location filename="../Project/Project.py" line="1601"/> <source><p>The source directory doesn't contain any files belonging to the selected category.</p></source> <translation><p>Директория не содержит ни одного файла, принадлежащего к заданной категории.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1594"/> + <location filename="../Project/Project.py" line="1614"/> <source><p>The target directory <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation><p>Невозможно создать директорию <b>{0}</b> </p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1678"/> + <location filename="../Project/Project.py" line="1698"/> <source>The source directory must not be empty.</source> <translation>Исходная директория не должна быть пустой.</translation> </message> <message> - <location filename="../Project/Project.py" line="1802"/> + <location filename="../Project/Project.py" line="1822"/> <source>Rename file</source> <translation>Переименовать файл</translation> </message> <message> - <location filename="../Project/Project.py" line="1826"/> + <location filename="../Project/Project.py" line="1846"/> <source>Rename File</source> <translation>Переименовать файл</translation> </message> <message> - <location filename="../Project/Project.py" line="2857"/> + <location filename="../Project/Project.py" line="2877"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1826"/> + <location filename="../Project/Project.py" line="1846"/> <source><p>The file <b>{0}</b> could not be renamed.<br />Reason: {1}</p></source> <translation><p>Невозможно переименовать файл <b>{0}</b>:<br>Причина: {1}.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="2062"/> + <location filename="../Project/Project.py" line="2082"/> <source>Delete file</source> <translation>Удалить файл</translation> </message> <message> - <location filename="../Project/Project.py" line="2062"/> + <location filename="../Project/Project.py" line="2082"/> <source><p>The selected file <b>{0}</b> could not be deleted.</p></source> <translation><p>Невозможно удалить выбранный файл <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="2091"/> + <location filename="../Project/Project.py" line="2111"/> <source>Delete directory</source> <translation>Удалить директорию</translation> </message> <message> - <location filename="../Project/Project.py" line="2091"/> + <location filename="../Project/Project.py" line="2111"/> <source><p>The selected directory <b>{0}</b> could not be deleted.</p></source> <translation><p>Невозможно удалить выбранную директорию <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="2173"/> + <location filename="../Project/Project.py" line="2193"/> <source>Create project directory</source> <translation>Создать директорию проекта</translation> </message> <message> - <location filename="../Project/Project.py" line="2173"/> + <location filename="../Project/Project.py" line="2193"/> <source><p>The project directory <b>{0}</b> could not be created.</p></source> <translation><p>Невозможно создать директорию проекта <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="2703"/> + <location filename="../Project/Project.py" line="2723"/> <source>New Project</source> <translation>Новый проект</translation> </message> <message> - <location filename="../Project/Project.py" line="2253"/> + <location filename="../Project/Project.py" line="2273"/> <source>Add existing files to the project?</source> <translation>Добавить существующие файлы в проект?</translation> </message> <message> - <location filename="../Project/Project.py" line="2703"/> + <location filename="../Project/Project.py" line="2723"/> <source>Select Version Control System</source> <translation>Выберите систему контроля версий (VCS)</translation> </message> <message> - <location filename="../Project/Project.py" line="2372"/> + <location filename="../Project/Project.py" line="2392"/> <source>Would you like to edit the VCS command options?</source> <translation>Вы хотите редактировать опции команд VCS?</translation> </message> <message> - <location filename="../Project/Project.py" line="3521"/> + <location filename="../Project/Project.py" line="3541"/> <source>New project</source> <translation>Новый проект</translation> </message> <message> - <location filename="../Project/Project.py" line="2320"/> + <location filename="../Project/Project.py" line="2340"/> <source>Shall the project file be added to the repository?</source> <translation>Добавить файл проекта в репозиторий?</translation> </message> <message> - <location filename="../Project/Project.py" line="2351"/> + <location filename="../Project/Project.py" line="2371"/> <source>None</source> <translation>None</translation> </message> <message> - <location filename="../Project/Project.py" line="2344"/> + <location filename="../Project/Project.py" line="2364"/> <source>Select version control system for the project</source> <translation>Выберите систему контроля версий для проекта</translation> </message> <message> - <location filename="../Project/Project.py" line="2450"/> + <location filename="../Project/Project.py" line="2470"/> <source>Translation Pattern</source> <translation>Шаблон перевода</translation> </message> <message> - <location filename="../Project/Project.py" line="2450"/> + <location filename="../Project/Project.py" line="2470"/> <source>Enter the path pattern for translation files (use '%language%' in place of the language code):</source> <translation>Введите шаблон пути для файлов переводов (используйте '%language%' вместо language code):</translation> </message> <message> - <location filename="../Project/Project.py" line="3535"/> + <location filename="../Project/Project.py" line="3555"/> <source>Open project</source> <translation>Открыть проект</translation> </message> <message> - <location filename="../Project/Project.py" line="2842"/> + <location filename="../Project/Project.py" line="2862"/> <source>Project Files (*.e4p)</source> <translation>Файлы проектов (*.e4p)</translation> </message> <message> - <location filename="../Project/Project.py" line="3572"/> + <location filename="../Project/Project.py" line="3592"/> <source>Save project as</source> <translation>Сохранить проект как</translation> </message> <message> - <location filename="../Project/Project.py" line="2857"/> + <location filename="../Project/Project.py" line="2877"/> <source>Save File</source> <translation>Сохранить файл</translation> </message> <message> - <location filename="../Project/Project.py" line="2893"/> + <location filename="../Project/Project.py" line="2913"/> <source>Close Project</source> <translation>Закрыть проект</translation> </message> <message> - <location filename="../Project/Project.py" line="2893"/> + <location filename="../Project/Project.py" line="2913"/> <source>The current project has unsaved changes.</source> <translation>Изменения в текущем проекте не сохранены.</translation> </message> <message> - <location filename="../Project/Project.py" line="3058"/> + <location filename="../Project/Project.py" line="3078"/> <source>Syntax errors detected</source> <translation>Найдены синтаксические ошибки</translation> </message> <message numerus="yes"> - <location filename="../Project/Project.py" line="3058"/> + <location filename="../Project/Project.py" line="3078"/> <source>The project contains %n file(s) with syntax errors.</source> <translation> <numerusform>Проект содержит %n файл с синтаксической ошибкой.</numerusform> @@ -40178,362 +40378,362 @@ </translation> </message> <message> - <location filename="../Project/Project.py" line="3521"/> + <location filename="../Project/Project.py" line="3541"/> <source>&New...</source> <translation>&Новый...</translation> </message> <message> - <location filename="../Project/Project.py" line="3526"/> + <location filename="../Project/Project.py" line="3546"/> <source>Generate a new project</source> <translation>Создать новый проект</translation> </message> <message> - <location filename="../Project/Project.py" line="3527"/> + <location filename="../Project/Project.py" line="3547"/> <source><b>New...</b><p>This opens a dialog for entering the info for a new project.</p></source> <translation><b>Новый...</b><p>Открытие диалога ввода информации о новом проекте.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3535"/> + <location filename="../Project/Project.py" line="3555"/> <source>&Open...</source> <translation>&Открыть...</translation> </message> <message> - <location filename="../Project/Project.py" line="3540"/> - <source>Open an existing project</source> - <translation>Открыть существующий проект</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3541"/> - <source><b>Open...</b><p>This opens an existing project.</p></source> - <translation><b>Открыть...</b><p>Открытие существующего проекта.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3548"/> - <source>Close project</source> - <translation>Закрыть проект</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3548"/> - <source>&Close</source> - <translation>&Закрыть</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3552"/> - <source>Close the current project</source> - <translation>Закрыть текущий проект</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3553"/> - <source><b>Close</b><p>This closes the current project.</p></source> - <translation><b>Закрыть</b><p>Закрытие текущего проекта.</p></translation> - </message> - <message> <location filename="../Project/Project.py" line="3560"/> - <source>Save project</source> - <translation>Сохранить проект</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3751"/> - <source>&Save</source> - <translation>&Сохранить</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3564"/> - <source>Save the current project</source> - <translation>Сохранить текущий проект</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3565"/> - <source><b>Save</b><p>This saves the current project.</p></source> - <translation><b>Сохранить</b><p>Сохранение текущего проекта.</p></translation> + <source>Open an existing project</source> + <translation>Открыть существующий проект</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3561"/> + <source><b>Open...</b><p>This opens an existing project.</p></source> + <translation><b>Открыть...</b><p>Открытие существующего проекта.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3568"/> + <source>Close project</source> + <translation>Закрыть проект</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3568"/> + <source>&Close</source> + <translation>&Закрыть</translation> </message> <message> <location filename="../Project/Project.py" line="3572"/> - <source>Save &as...</source> - <translation>Сохранить &как...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3576"/> - <source>Save the current project to a new file</source> - <translation>Сохранить текущий проект в новый файл</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3578"/> - <source><b>Save as</b><p>This saves the current project to a new file.</p></source> - <translation><b>Сохранить как</b><p> Сохранение текущего проекта в новый файл.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3587"/> - <source>Add files to project</source> - <translation>Добавить файлы в проект</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3587"/> - <source>Add &files...</source> - <translation>Добавить &файлы...</translation> + <source>Close the current project</source> + <translation>Закрыть текущий проект</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3573"/> + <source><b>Close</b><p>This closes the current project.</p></source> + <translation><b>Закрыть</b><p>Закрытие текущего проекта.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3580"/> + <source>Save project</source> + <translation>Сохранить проект</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3771"/> + <source>&Save</source> + <translation>&Сохранить</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3584"/> + <source>Save the current project</source> + <translation>Сохранить текущий проект</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3585"/> + <source><b>Save</b><p>This saves the current project.</p></source> + <translation><b>Сохранить</b><p>Сохранение текущего проекта.</p></translation> </message> <message> <location filename="../Project/Project.py" line="3592"/> + <source>Save &as...</source> + <translation>Сохранить &как...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3596"/> + <source>Save the current project to a new file</source> + <translation>Сохранить текущий проект в новый файл</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3598"/> + <source><b>Save as</b><p>This saves the current project to a new file.</p></source> + <translation><b>Сохранить как</b><p> Сохранение текущего проекта в новый файл.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3607"/> + <source>Add files to project</source> + <translation>Добавить файлы в проект</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3607"/> + <source>Add &files...</source> + <translation>Добавить &файлы...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3612"/> <source>Add files to the current project</source> <translation>Добавить файлы в текущий проект</translation> </message> <message> - <location filename="../Project/Project.py" line="3594"/> + <location filename="../Project/Project.py" line="3614"/> <source><b>Add files...</b><p>This opens a dialog for adding files to the current project. The place to add is determined by the file extension.</p></source> <translation><b>Добавить файлы</b> <p>Открытие диалога добавления файлов в текущий проект. Место добавления определяется расширением файла.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3603"/> + <location filename="../Project/Project.py" line="3623"/> <source>Add directory to project</source> <translation>Добавить директорию в проект</translation> </message> <message> - <location filename="../Project/Project.py" line="3603"/> - <source>Add directory...</source> - <translation>Добавить директорию...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3608"/> - <source>Add a directory to the current project</source> - <translation>Добавить директорию в текущий проект</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3610"/> - <source><b>Add directory...</b><p>This opens a dialog for adding a directory to the current project.</p></source> - <translation><b>Добавить директорию...</b> -<p>Открытие диалога добавления директории к текущему проекту.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3618"/> - <source>Add translation to project</source> - <translation>Добавить перевод в проект</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3618"/> - <source>Add &translation...</source> - <translation>Добавить &перевод...</translation> - </message> - <message> <location filename="../Project/Project.py" line="3623"/> + <source>Add directory...</source> + <translation>Добавить директорию...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3628"/> + <source>Add a directory to the current project</source> + <translation>Добавить директорию в текущий проект</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3630"/> + <source><b>Add directory...</b><p>This opens a dialog for adding a directory to the current project.</p></source> + <translation><b>Добавить директорию...</b> +<p>Открытие диалога добавления директории к текущему проекту.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3638"/> + <source>Add translation to project</source> + <translation>Добавить перевод в проект</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3638"/> + <source>Add &translation...</source> + <translation>Добавить &перевод...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3643"/> <source>Add a translation to the current project</source> <translation>Добавить перевод в текущий проект</translation> </message> <message> - <location filename="../Project/Project.py" line="3625"/> + <location filename="../Project/Project.py" line="3645"/> <source><b>Add translation...</b><p>This opens a dialog for add a translation to the current project.</p></source> <translation><b>Добавить перевод...</b><p>Открытие диалога добавления перевода в текущий проект.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3633"/> + <location filename="../Project/Project.py" line="3653"/> <source>Search new files</source> <translation>Поиск новых файлов</translation> </message> <message> - <location filename="../Project/Project.py" line="3633"/> + <location filename="../Project/Project.py" line="3653"/> <source>Searc&h new files...</source> <translation>Поис&к новых файлов...</translation> </message> <message> - <location filename="../Project/Project.py" line="3637"/> + <location filename="../Project/Project.py" line="3657"/> <source>Search new files in the project directory.</source> <translation>Поиск новых файлов в директории проекта.</translation> </message> <message> - <location filename="../Project/Project.py" line="3639"/> + <location filename="../Project/Project.py" line="3659"/> <source><b>Search new files...</b><p>This searches for new files (sources, *.ui, *.idl) in the project directory and registered subdirectories.</p></source> <translation><b>Искать новые файлы...</b><p>Поиск новых файлов (исходников, *.ui, *.idl) в директории проекта и зарегистрированных поддиректориях.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3662"/> - <source>Project properties</source> - <translation>Свойства проекта</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3662"/> - <source>&Properties...</source> - <translation>&Свойства...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3667"/> - <source>Show the project properties</source> - <translation>Показать свойства проекта</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3668"/> - <source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source> - <translation><b>Свойства...</b><p>Отображение диалога для редактирования свойств проекта.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3675"/> - <source>User project properties</source> - <translation>Пользовательские настройки проекта</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3675"/> - <source>&User Properties...</source> - <translation>&Пользовательские свойства...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3680"/> - <source>Show the user specific project properties</source> - <translation>Показать пользовательские свойства проекта</translation> - </message> - <message> <location filename="../Project/Project.py" line="3682"/> + <source>Project properties</source> + <translation>Свойства проекта</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3682"/> + <source>&Properties...</source> + <translation>&Свойства...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3687"/> + <source>Show the project properties</source> + <translation>Показать свойства проекта</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3688"/> + <source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source> + <translation><b>Свойства...</b><p>Отображение диалога для редактирования свойств проекта.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3695"/> + <source>User project properties</source> + <translation>Пользовательские настройки проекта</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3695"/> + <source>&User Properties...</source> + <translation>&Пользовательские свойства...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3700"/> + <source>Show the user specific project properties</source> + <translation>Показать пользовательские свойства проекта</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3702"/> <source><b>User Properties...</b><p>This shows a dialog to edit the user specific project properties.</p></source> <translation><b>Пользовательские свойства...</b><p>Отображает диалог редактирования пользовательских свойств проекта.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3690"/> + <location filename="../Project/Project.py" line="3710"/> <source>Filetype Associations</source> <translation>Ассоциации типа файлов</translation> </message> <message> - <location filename="../Project/Project.py" line="3690"/> + <location filename="../Project/Project.py" line="3710"/> <source>Filetype Associations...</source> <translation>Ассоциации для типа файлов...</translation> </message> <message> - <location filename="../Project/Project.py" line="3694"/> - <source>Show the project filetype associations</source> - <translation>Показать ассоциации типов файлов для проекта</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3696"/> - <source><b>Filetype Associations...</b><p>This shows a dialog to edit the filetype associations of the project. These associations determine the type (source, form, interface or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.</p></source> - <translation><b>Ассоциации типов файлов...</b> -<p>Отображение диалога для редактирования ассоциаций типов файлов проекта. Эти ассоциации связывают тип файла (исходник, форма, интерфейс и т.д.) с шаблоном имени файла. Они используются при добавлении файлов в проект и при поиске новых файлов.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3708"/> - <source>Lexer Associations</source> - <translation>Ассоциации для лексеров</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3708"/> - <source>Lexer Associations...</source> - <translation>Ассоциации для лексеров...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3712"/> - <source>Show the project lexer associations (overriding defaults)</source> - <translation>Показать ассоциации для лексеров</translation> - </message> - <message> <location filename="../Project/Project.py" line="3714"/> + <source>Show the project filetype associations</source> + <translation>Показать ассоциации типов файлов для проекта</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3716"/> + <source><b>Filetype Associations...</b><p>This shows a dialog to edit the filetype associations of the project. These associations determine the type (source, form, interface or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.</p></source> + <translation><b>Ассоциации типов файлов...</b> +<p>Отображение диалога для редактирования ассоциаций типов файлов проекта. Эти ассоциации связывают тип файла (исходник, форма, интерфейс и т.д.) с шаблоном имени файла. Они используются при добавлении файлов в проект и при поиске новых файлов.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3728"/> + <source>Lexer Associations</source> + <translation>Ассоциации для лексеров</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3728"/> + <source>Lexer Associations...</source> + <translation>Ассоциации для лексеров...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3732"/> + <source>Show the project lexer associations (overriding defaults)</source> + <translation>Показать ассоциации для лексеров</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3734"/> <source><b>Lexer Associations...</b><p>This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.</p></source> <translation><b>Ассоциации для лексеров...</b><p>Показать ассоциации лексеров для проекта. Лексеры используются для подсвечивания текста в редакторе.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3726"/> + <location filename="../Project/Project.py" line="3746"/> <source>Debugger Properties</source> <translation>Свойства отладчика</translation> </message> <message> - <location filename="../Project/Project.py" line="3726"/> + <location filename="../Project/Project.py" line="3746"/> <source>Debugger &Properties...</source> <translation>&Свойства отладчика...</translation> </message> <message> - <location filename="../Project/Project.py" line="3730"/> + <location filename="../Project/Project.py" line="3750"/> <source>Show the debugger properties</source> <translation>Показать свойства отладчика</translation> </message> <message> - <location filename="../Project/Project.py" line="3731"/> - <source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source> - <translation><b>Свойства отладчика...</b> -<p>Отображение диалога редактирования свойств отладчика, специфичных для данного проекта.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3739"/> - <source>Load</source> - <translation>Загрузить</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3739"/> - <source>&Load</source> - <translation>&Загрузить</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3743"/> - <source>Load the debugger properties</source> - <translation>Загрузить свойства отладчика</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3744"/> - <source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source> - <translation><b>Загрузить свойства отладчика</b> -<p>Загрузить свойства отладчика, специфичные для данного проекта.</p></translation> - </message> - <message> <location filename="../Project/Project.py" line="3751"/> - <source>Save</source> - <translation>Сохранить</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3755"/> - <source>Save the debugger properties</source> - <translation>Сохранить свойства отладчика</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3756"/> - <source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source> - <translation><b>Сохранить свойства отладчика</b><p>Сохранить свойства отладчика, специфичные для данного проекта.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3763"/> - <source>Delete</source> - <translation>Удалить</translation> + <source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source> + <translation><b>Свойства отладчика...</b> +<p>Отображение диалога редактирования свойств отладчика, специфичных для данного проекта.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3759"/> + <source>Load</source> + <translation>Загрузить</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3759"/> + <source>&Load</source> + <translation>&Загрузить</translation> </message> <message> <location filename="../Project/Project.py" line="3763"/> - <source>&Delete</source> - <translation>&Удалить</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3767"/> - <source>Delete the debugger properties</source> - <translation>Удалить свойства отладчика</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3768"/> - <source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source> - <translation><b>Удалить свойства отладчика</b><p>Удалить свойства отладчика, специфичные для данного проекта.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3776"/> - <source>Reset</source> - <translation>Сбросить</translation> + <source>Load the debugger properties</source> + <translation>Загрузить свойства отладчика</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3764"/> + <source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source> + <translation><b>Загрузить свойства отладчика</b> +<p>Загрузить свойства отладчика, специфичные для данного проекта.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3771"/> + <source>Save</source> + <translation>Сохранить</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3775"/> + <source>Save the debugger properties</source> + <translation>Сохранить свойства отладчика</translation> </message> <message> <location filename="../Project/Project.py" line="3776"/> + <source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source> + <translation><b>Сохранить свойства отладчика</b><p>Сохранить свойства отладчика, специфичные для данного проекта.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3783"/> + <source>Delete</source> + <translation>Удалить</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3783"/> + <source>&Delete</source> + <translation>&Удалить</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3787"/> + <source>Delete the debugger properties</source> + <translation>Удалить свойства отладчика</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3788"/> + <source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source> + <translation><b>Удалить свойства отладчика</b><p>Удалить свойства отладчика, специфичные для данного проекта.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3796"/> + <source>Reset</source> + <translation>Сбросить</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3796"/> <source>&Reset</source> <translation>&Сбросить</translation> </message> <message> - <location filename="../Project/Project.py" line="3780"/> + <location filename="../Project/Project.py" line="3800"/> <source>Reset the debugger properties</source> <translation>Сбросить свойства отладчика</translation> </message> <message> - <location filename="../Project/Project.py" line="3781"/> + <location filename="../Project/Project.py" line="3801"/> <source><b>Reset Debugger Properties</b><p>This resets the project specific debugger settings.</p></source> <translation><b>Сбросить свойства отладчика</b><p>Сбросить свойства отладчика, специфичные для данного проекта.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3790"/> + <location filename="../Project/Project.py" line="3810"/> <source>Load session</source> <translation>Загрузить сессию</translation> </message> <message> - <location filename="../Project/Project.py" line="3794"/> + <location filename="../Project/Project.py" line="3814"/> <source>Load the projects session file.</source> <translation>Загрузить файл с сессией проекта.</translation> </message> <message> - <location filename="../Project/Project.py" line="3795"/> + <location filename="../Project/Project.py" line="3815"/> <source><b>Load session</b><p>This loads the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Загрузить сессию</b> <p>Загрузить файл с сессией проекта. Сессия содержит следующие данные:<br> @@ -40545,17 +40745,17 @@ </p></translation> </message> <message> - <location filename="../Project/Project.py" line="3808"/> + <location filename="../Project/Project.py" line="3828"/> <source>Save session</source> <translation>Сохранить сессию</translation> </message> <message> - <location filename="../Project/Project.py" line="3812"/> + <location filename="../Project/Project.py" line="3832"/> <source>Save the projects session file.</source> <translation>Сохранить файл с сессией проекта.</translation> </message> <message> - <location filename="../Project/Project.py" line="3813"/> + <location filename="../Project/Project.py" line="3833"/> <source><b>Save session</b><p>This saves the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Сохранить сессию</b> <p>Сохранить файл с сессией проекта. Сессия содержит следующие данные:<br> @@ -40567,252 +40767,252 @@ </p></translation> </message> <message> - <location filename="../Project/Project.py" line="3826"/> + <location filename="../Project/Project.py" line="3846"/> <source>Delete session</source> <translation>Удалить сессию</translation> </message> <message> - <location filename="../Project/Project.py" line="3830"/> + <location filename="../Project/Project.py" line="3850"/> <source>Delete the projects session file.</source> <translation>Удалить файл с сессией проекта.</translation> </message> <message> - <location filename="../Project/Project.py" line="3831"/> + <location filename="../Project/Project.py" line="3851"/> <source><b>Delete session</b><p>This deletes the projects session file</p></source> <translation><b>Удалить сессию</b><p>Удалить файл с сессией проекта</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3840"/> - <source>Code Metrics</source> - <translation>Статистика кода</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3840"/> - <source>&Code Metrics...</source> - <translation>&Статистика кода...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3844"/> - <source>Show some code metrics for the project.</source> - <translation>Отображение статистики кода проекта.</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3846"/> - <source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source> - <translation><b>Статистика кода...</b><p>Отображение статистики кода проекта.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3854"/> - <source>Python Code Coverage</source> - <translation>Охват кода Python</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3854"/> - <source>Code Co&verage...</source> - <translation>&Заключения по коду...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3858"/> - <source>Show code coverage information for the project.</source> - <translation>Показать заключение охвата по коду проекта.</translation> - </message> - <message> <location filename="../Project/Project.py" line="3860"/> - <source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source> - <translation><b>Заключение по охвату коду...</b><p>Показать заключение охвата по коду всех файлов проекта.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="4646"/> - <source>Profile Data</source> - <translation>Данные профайлера</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3868"/> - <source>&Profile Data...</source> - <translation>&Данные профайлера...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3872"/> - <source>Show profiling data for the project.</source> - <translation>Отображение результатов профилирования проекта.</translation> + <source>Code Metrics</source> + <translation>Статистика кода</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3860"/> + <source>&Code Metrics...</source> + <translation>&Статистика кода...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3864"/> + <source>Show some code metrics for the project.</source> + <translation>Отображение статистики кода проекта.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3866"/> + <source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source> + <translation><b>Статистика кода...</b><p>Отображение статистики кода проекта.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3874"/> + <source>Python Code Coverage</source> + <translation>Охват кода Python</translation> </message> <message> <location filename="../Project/Project.py" line="3874"/> + <source>Code Co&verage...</source> + <translation>&Заключения по коду...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3878"/> + <source>Show code coverage information for the project.</source> + <translation>Показать заключение охвата по коду проекта.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3880"/> + <source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source> + <translation><b>Заключение по охвату коду...</b><p>Показать заключение охвата по коду всех файлов проекта.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4666"/> + <source>Profile Data</source> + <translation>Данные профайлера</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3888"/> + <source>&Profile Data...</source> + <translation>&Данные профайлера...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3892"/> + <source>Show profiling data for the project.</source> + <translation>Отображение результатов профилирования проекта.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3894"/> <source><b>Profile Data...</b><p>This shows the profiling data for the project.</p></source> <translation><b>Данные профайлера...</b><p>Отображение результатов профилирования проекта.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4700"/> + <location filename="../Project/Project.py" line="4720"/> <source>Application Diagram</source> <translation>Диаграмма приложения</translation> </message> <message> - <location filename="../Project/Project.py" line="3883"/> + <location filename="../Project/Project.py" line="3903"/> <source>&Application Diagram...</source> <translation>&Диаграмма приложения...</translation> </message> <message> - <location filename="../Project/Project.py" line="3887"/> + <location filename="../Project/Project.py" line="3907"/> <source>Show a diagram of the project.</source> <translation>Показать диаграмму проекта.</translation> </message> <message> - <location filename="../Project/Project.py" line="3889"/> + <location filename="../Project/Project.py" line="3909"/> <source><b>Application Diagram...</b><p>This shows a diagram of the project.</p></source> <translation><b>Диаграмма приложения...</b><p>Отображает диаграмму проекта.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4885"/> + <location filename="../Project/Project.py" line="4905"/> <source>Create Package List</source> <translation>Создать список пакета</translation> </message> <message> - <location filename="../Project/Project.py" line="3912"/> + <location filename="../Project/Project.py" line="3932"/> <source>Create &Package List</source> <translation>&Создать список пакета</translation> </message> <message> - <location filename="../Project/Project.py" line="5143"/> + <location filename="../Project/Project.py" line="5163"/> <source>Create Plugin Archive</source> <translation>Создать архив плагина</translation> </message> <message> - <location filename="../Project/Project.py" line="3928"/> + <location filename="../Project/Project.py" line="3948"/> <source>Create Plugin &Archives</source> <translation>Создать архивы &плагина</translation> </message> <message> - <location filename="../Project/Project.py" line="3982"/> + <location filename="../Project/Project.py" line="4002"/> <source>&Project</source> <translation>&Проект</translation> </message> <message> - <location filename="../Project/Project.py" line="3983"/> + <location filename="../Project/Project.py" line="4003"/> <source>Open &Recent Projects</source> <translation>Открыть &недавние проекты</translation> </message> <message> - <location filename="../Project/Project.py" line="3984"/> + <location filename="../Project/Project.py" line="4004"/> <source>&Version Control</source> <translation>Контроль &версий</translation> </message> <message> - <location filename="../Project/Project.py" line="3988"/> + <location filename="../Project/Project.py" line="4008"/> <source>Chec&k</source> <translation>&Проверки</translation> </message> <message> - <location filename="../Project/Project.py" line="3990"/> + <location filename="../Project/Project.py" line="4010"/> <source>Sho&w</source> <translation>По&казать</translation> </message> <message> - <location filename="../Project/Project.py" line="3991"/> + <location filename="../Project/Project.py" line="4011"/> <source>&Diagrams</source> <translation>&Диаграммы</translation> </message> <message> - <location filename="../Project/Project.py" line="3992"/> + <location filename="../Project/Project.py" line="4012"/> <source>Session</source> <translation>Сессия</translation> </message> <message> - <location filename="../Project/Project.py" line="3993"/> + <location filename="../Project/Project.py" line="4013"/> <source>Source &Documentation</source> <translation>&Документация исходников</translation> </message> <message> - <location filename="../Project/Project.py" line="3995"/> + <location filename="../Project/Project.py" line="4015"/> <source>Debugger</source> <translation>Отладка</translation> </message> <message> - <location filename="../Project/Project.py" line="3996"/> + <location filename="../Project/Project.py" line="4016"/> <source>Pac&kagers</source> <translation>У&паковщики</translation> </message> <message> - <location filename="../Project/Project.py" line="4104"/> + <location filename="../Project/Project.py" line="4124"/> <source>Project</source> <translation>Проект</translation> </message> <message> - <location filename="../Project/Project.py" line="4170"/> + <location filename="../Project/Project.py" line="4190"/> <source>&Clear</source> <translation>&Очистить</translation> </message> <message> - <location filename="../Project/Project.py" line="4309"/> + <location filename="../Project/Project.py" line="4329"/> <source>Search New Files</source> <translation>Поиск новых файлов</translation> </message> <message> - <location filename="../Project/Project.py" line="4309"/> + <location filename="../Project/Project.py" line="4329"/> <source>There were no new files found to be added.</source> <translation>Не найдено файлов для добавления.</translation> </message> <message> - <location filename="../Project/Project.py" line="4455"/> + <location filename="../Project/Project.py" line="4475"/> <source>Version Control System</source> <translation>Система контроля версий</translation> </message> <message> - <location filename="../Project/Project.py" line="4455"/> + <location filename="../Project/Project.py" line="4475"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Disabling version control.</p><p>{1}</p></source> <translation><p>Выбранная VCS <b>{0}</b> не найдена.<br/>Контроль версий отключен.</p><p>{1}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4573"/> + <location filename="../Project/Project.py" line="4593"/> <source>Coverage Data</source> <translation>Данные охвата</translation> </message> <message> - <location filename="../Project/Project.py" line="4623"/> + <location filename="../Project/Project.py" line="4643"/> <source>There is no main script defined for the current project. Aborting</source> <translation>Для текущего проекта не определён главный сценарий. Отмена</translation> </message> <message> - <location filename="../Project/Project.py" line="4596"/> + <location filename="../Project/Project.py" line="4616"/> <source>Code Coverage</source> <translation>Охват кода</translation> </message> <message> - <location filename="../Project/Project.py" line="4596"/> + <location filename="../Project/Project.py" line="4616"/> <source>Please select a coverage file</source> <translation>Пожалуйста, выберите файл для информации охвата</translation> </message> <message> - <location filename="../Project/Project.py" line="4646"/> + <location filename="../Project/Project.py" line="4666"/> <source>Please select a profile file</source> <translation>Пожалуйста, выберите файл профиля</translation> </message> <message> - <location filename="../Project/Project.py" line="4700"/> + <location filename="../Project/Project.py" line="4720"/> <source>Include module names?</source> <translation>Включать имена модулей?</translation> </message> <message> - <location filename="../Project/Project.py" line="4845"/> + <location filename="../Project/Project.py" line="4865"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>Файл <b>PKGLIST</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4885"/> + <location filename="../Project/Project.py" line="4905"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation><p>Невозможно создать файл <b>PKGLIST</b>.</p><p>Причина: {0}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4904"/> + <location filename="../Project/Project.py" line="4924"/> <source>The project does not have a main script defined. Aborting...</source> <translation>Для текущего проекта не определён главный сценарий. Отмена...</translation> </message> <message> - <location filename="../Project/Project.py" line="5027"/> + <location filename="../Project/Project.py" line="5047"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation><p>Невозможно сохранить файл <b>{0}</b> в архиве. Игнорируем его.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="5101"/> + <location filename="../Project/Project.py" line="5121"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>Невозможно прочитать файл плагина <b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> @@ -40822,32 +41022,32 @@ <translation>Python2 файлы (*.py2);;Python2 GUI файлы (*.pyw2);;</translation> </message> <message> - <location filename="../Project/Project.py" line="2240"/> + <location filename="../Project/Project.py" line="2260"/> <source>Create main script</source> <translation>Создать главный сценарий</translation> </message> <message> - <location filename="../Project/Project.py" line="2240"/> + <location filename="../Project/Project.py" line="2260"/> <source><p>The mainscript <b>{0}</b> could not be created.<br/>Reason: {1}</p></source> <translation><p>Невозможно создать главный файл проекта<b>{0}</b>.<br>Причина: {1}.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3897"/> + <location filename="../Project/Project.py" line="3917"/> <source>Load Diagram</source> <translation>Загрузить диаграмму</translation> </message> <message> - <location filename="../Project/Project.py" line="3897"/> + <location filename="../Project/Project.py" line="3917"/> <source>&Load Diagram...</source> <translation>&Загрузить диаграмму...</translation> </message> <message> - <location filename="../Project/Project.py" line="3901"/> + <location filename="../Project/Project.py" line="3921"/> <source>Load a diagram from file.</source> <translation>Загрузить диаграмму из файла.</translation> </message> <message> - <location filename="../Project/Project.py" line="3903"/> + <location filename="../Project/Project.py" line="3923"/> <source><b>Load Diagram...</b><p>This loads a diagram from file.</p></source> <translation><b>Загрузить диаграмму...</b><p>Загрузить диаграмму из файла.</p></translation> </message> @@ -40877,37 +41077,37 @@ <translation>Консоль PyQt5</translation> </message> <message> - <location filename="../Project/Project.py" line="4443"/> + <location filename="../Project/Project.py" line="4463"/> <source><p>The selected VCS <b>{0}</b> could not be found. <br/>Reverting override.</p><p>{1}</p></source> <translation><p>Выбранная VCS <b>{0}</b> не найдена.<br/>Откат отвергнут.</p><p>{1}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="5143"/> + <location filename="../Project/Project.py" line="5163"/> <source><p>The plugin file <b>{0}</b> could not be read.</p> <p>Reason: {1}</p></source> <translation><p>Невозможно прочитать файл плагина <b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3917"/> + <location filename="../Project/Project.py" line="3937"/> <source>Create an initial PKGLIST file for an eric6 plugin.</source> <translation>Создать первичный файл PKGLIST для плагина Eric6.</translation> </message> <message> - <location filename="../Project/Project.py" line="3919"/> + <location filename="../Project/Project.py" line="3939"/> <source><b>Create Package List</b><p>This creates an initial list of files to include in an eric6 plugin archive. The list is created from the project file.</p></source> <translation><b>Создать список пакета</b><p>Создаёт начальный список файлов для включения в архив плагина Eric6. Список создаётся из файла проекта.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3933"/> + <location filename="../Project/Project.py" line="3953"/> <source>Create eric6 plugin archive files.</source> <translation>Создание архивных файлов плагина eric6.</translation> </message> <message> - <location filename="../Project/Project.py" line="3935"/> + <location filename="../Project/Project.py" line="3955"/> <source><b>Create Plugin Archives</b><p>This creates eric6 plugin archive files using the list of files given in a PKGLIST* file. The archive name is built from the main script name if not designated in the package list file.</p></source> <translation><b>Создать архивы плагина</b><p>Создание архивных файлов плагина eric6, используя список файлов, приведенный в файле PKGLIST. Имя архива, если оно не задано в в файле со списком пакета, создается из имени главного скрипта.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4992"/> + <location filename="../Project/Project.py" line="5012"/> <source><p>The eric6 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation><p>Невозможно создать архив плагина <b>{0}</b> Eric6.</p><p>Причина: {1}</p></translation> </message> @@ -40927,103 +41127,103 @@ <translation>Плагин Eric6</translation> </message> <message> - <location filename="../Project/Project.py" line="2673"/> + <location filename="../Project/Project.py" line="2693"/> <source>Create project management directory</source> <translation>Создать служебную директорию проекта</translation> </message> <message> - <location filename="../Project/Project.py" line="2673"/> + <location filename="../Project/Project.py" line="2693"/> <source><p>The project directory <b>{0}</b> is not writable.</p></source> <translation><p>Директория проекта <b>{0}</b> не доступна для записи.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3647"/> + <location filename="../Project/Project.py" line="3667"/> <source>Alt+Ctrl+P</source> <comment>Project|Search Project File</comment> <translation>Alt+Ctrl+P</translation> </message> <message> - <location filename="../Project/Project.py" line="3653"/> + <location filename="../Project/Project.py" line="3673"/> <source>Search for a file in the project list of files.</source> <translation>Поиск файла в списке файлов проекта.</translation> </message> <message> - <location filename="../Project/Project.py" line="3655"/> + <location filename="../Project/Project.py" line="3675"/> <source><b>Search Project File</b><p>This searches for a file in the project list of files.</p></source> <translation><b>Поиск файла проекта</b><p>Поиск файла в списке файлов проекта.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3647"/> + <location filename="../Project/Project.py" line="3667"/> <source>Search Project File</source> <translation>Поиск файла проекта</translation> </message> <message> - <location filename="../Project/Project.py" line="3647"/> + <location filename="../Project/Project.py" line="3667"/> <source>Search Project File...</source> <translation>Поиск файла проекта...</translation> </message> <message> - <location filename="../Project/Project.py" line="4939"/> + <location filename="../Project/Project.py" line="4959"/> <source>Create Plugin Archives</source> <translation>Создать архивы плагина</translation> </message> <message> - <location filename="../Project/Project.py" line="3945"/> + <location filename="../Project/Project.py" line="3965"/> <source>Create Plugin Archives (Snapshot)</source> <translation>Создать архивы плагина (Snapshot)</translation> </message> <message> - <location filename="../Project/Project.py" line="3945"/> + <location filename="../Project/Project.py" line="3965"/> <source>Create Plugin Archives (&Snapshot)</source> <translation>Создать архивы плагина (&Snapshot)</translation> </message> <message> - <location filename="../Project/Project.py" line="3950"/> + <location filename="../Project/Project.py" line="3970"/> <source>Create eric6 plugin archive files (snapshot releases).</source> <translation>Создание архивных файлов плагина eric6 (snapshot releases).</translation> </message> <message> - <location filename="../Project/Project.py" line="3952"/> + <location filename="../Project/Project.py" line="3972"/> <source><b>Create Plugin Archives (Snapshot)</b><p>This creates eric6 plugin archive files using the list of files given in the PKGLIST* file. The archive name is built from the main script name if not designated in the package list file. The version entry of the main script is modified to reflect a snapshot release.</p></source> <translation><b>Создать архивы плагина (Snapshot)</b><p>Создание архивных файлов плагина eric6, используя список файлов, приведенный в файле PKGLIST. Имя архива, если оно не задано в в файле со списком пакета, создается из имени главного сценария. Версия главного скрипта изменяется в соответствии релизом snapshot.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4918"/> + <location filename="../Project/Project.py" line="4938"/> <source>Select package lists:</source> <translation>Выбор списков пакета:</translation> </message> <message> - <location filename="../Project/Project.py" line="4935"/> + <location filename="../Project/Project.py" line="4955"/> <source>Creating plugin archives...</source> <translation>Создание архивов плагина...</translation> </message> <message> - <location filename="../Project/Project.py" line="4935"/> + <location filename="../Project/Project.py" line="4955"/> <source>Abort</source> <translation>Прервать</translation> </message> <message> - <location filename="../Project/Project.py" line="4935"/> + <location filename="../Project/Project.py" line="4955"/> <source>%v/%m Archives</source> <translation>%v из %m архивов</translation> </message> <message> - <location filename="../Project/Project.py" line="4952"/> + <location filename="../Project/Project.py" line="4972"/> <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>Невозможно прочитать файл <b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="5046"/> + <location filename="../Project/Project.py" line="5066"/> <source><p>The eric6 plugin archive files were created with some errors.</p></source> <translation><p>Файлы архива плагина eric6 были созданы с ошибками.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="5049"/> + <location filename="../Project/Project.py" line="5069"/> <source><p>The eric6 plugin archive files were created successfully.</p></source> <translation><p>Файлы архива плагина eric6 созданы успешно.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4928"/> + <location filename="../Project/Project.py" line="4948"/> <source><p>No package list files (PKGLIST*) available or selected. Aborting...</p></source> <translation><p>Файлы со списком пакета (PKGLIST*) не доступны или не выбраны. Отмена...</p></translation> </message> @@ -43000,7 +43200,7 @@ <translation>Выполнено</translation> </message> <message> - <location filename="../DataViews/PyCoverageDialog.py" line="349"/> + <location filename="../DataViews/PyCoverageDialog.ui" line="172"/> <source>Coverage</source> <translation>Охват</translation> </message> @@ -43081,7 +43281,7 @@ </translation> </message> <message> - <location filename="../DataViews/PyCoverageDialog.py" line="345"/> + <location filename="../DataViews/PyCoverageDialog.ui" line="192"/> <source>%v/%m Files</source> <translation>%v из %m файлов</translation> </message> @@ -43089,7 +43289,7 @@ <context> <name>PyProfileDialog</name> <message> - <location filename="../DataViews/PyProfileDialog.py" line="233"/> + <location filename="../DataViews/PyProfileDialog.ui" line="20"/> <source>Profile Results</source> <translation>Результаты профайлера</translation> </message> @@ -44074,522 +44274,502 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/> - <source>Show log</source> - <translation>Показать историю ревизий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/> - <source>Show &log</source> - <translation>Показать &историю ревизий</translation> + <source>Show log browser</source> + <translation>Показать браузер журнала</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> - <source>Show the log of the local project</source> - <translation>Показать историю изменений локального проекта</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation>Отображение диалога просмотра журнала локального проекта</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="107"/> - <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation><b>Показать историю</b><p>Показать историю изменений локального проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="114"/> - <source>Show log browser</source> - <translation>Показать браузер журнала</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="119"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>Отображение диалога просмотра журнала локального проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Показать браузер журнала</b><p>Отображение диалога просмотра журнала локального проекта. Изначально показывается ограниченное количество записей. Следующие записи могут быть получены дополнительно.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/> <source>Show differences</source> <translation>Показать различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/> <source>Show &difference</source> <translation>Показать &различие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/> <source>Show the difference of the local project to the repository</source> <translation>Показать различие локального проекта и репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation><b>Показать различия</b><p>Показ различий локального проекта относительно репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="132"/> <source>Show differences (extended)</source> <translation>Показать различия (подробно)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="137"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Показать различие ревизий проекта в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="140"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation><b>Показать различия (подробно)</b><p>Отображение различий выделеных ревизий проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/> <source>Show differences (URLs)</source> <translation>Показать различия (URLs)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="153"/> <source>Show the difference of the project between two repository URLs</source> <translation>Показать различие проекта двух URLs репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="156"/> <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> <translation><b>Показать различия(URLs)</b><p>Показать различия проекта двух URLs репозиториев.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/> + <source>Show status</source> + <translation>Показать статус</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/> + <source>Show &status</source> + <translation>Показать &статус</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> + <source>Show the status of the local project</source> + <translation>Показать статус локального проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="172"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation><b>Показать статус</b><p>Отображение статуса локального проекта.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> - <source>Show status</source> - <translation>Показать статус</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> - <source>Show &status</source> - <translation>Показать &статус</translation> + <source>Show change lists</source> + <translation>Показать списки изменений</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/> - <source>Show the status of the local project</source> - <translation>Показать статус локального проекта</translation> + <source>Show the change lists and associated files of the local project</source> + <translation>Показать списки изменений и соответствующие имена файлов локального проекта</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="187"/> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation><b>Показать статус</b><p>Отображение статуса локального проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> - <source>Show change lists</source> - <translation>Показать списки изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="199"/> - <source>Show the change lists and associated files of the local project</source> - <translation>Показать списки изменений и соответствующие имена файлов локального проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="202"/> <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> <translation><b>Показать списки изменений</b><p>Показать списки изменений и соответствующие имена файлов локального проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> <source>Show repository info</source> <translation>Показать информацию о репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="215"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="200"/> <source>Show some repository related information for the local project</source> <translation>Отобразить информацию о репозизтории локального проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="203"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation><b>Информация о репозитории</b><p>Отобразить информацию о репозитории локального проекта.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source>Tag in repository</source> + <translation>Создать тег в репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source>&Tag in repository...</source> + <translation>Создать &тег в репозитории...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="216"/> + <source>Tag the local project in the repository</source> + <translation>Тег локального проекта в репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Создать тег</b><p>Создаёт тег для локального проекта в репозитории.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> - <source>Tag in repository</source> - <translation>Создать тег в репозитории</translation> + <source>Export from repository</source> + <translation>Экспорт из репозитория</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> - <source>&Tag in repository...</source> - <translation>Создать &тег в репозитории...</translation> + <source>&Export from repository...</source> + <translation>&Экспорт из репозитория...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="231"/> - <source>Tag the local project in the repository</source> - <translation>Тег локального проекта в репозитории</translation> + <source>Export a project from the repository</source> + <translation>Экспортировать проект из репозитория</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Создать тег</b><p>Создаёт тег для локального проекта в репозитории.</p></translation> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>Экспорт из репозитория</b><p>Экспорт проекта из репозитория.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> - <source>Export from repository</source> - <translation>Экспорт из репозитория</translation> + <source>Command options</source> + <translation>Опции командной строки</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> - <source>&Export from repository...</source> - <translation>&Экспорт из репозитория...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="246"/> - <source>Export a project from the repository</source> - <translation>Экспортировать проект из репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation><b>Экспорт из репозитория</b><p>Экспорт проекта из репозитория.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/> - <source>Command options</source> - <translation>Опции командной строки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/> <source>Command &options...</source> <translation>&Опции командной строки...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Show the VCS command options</source> <translation>Показать опции командной строки VCS</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation><b>Опции командной строки...</b><p>Отображение диалога редактирования опций командной строки VCS.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/> + <source>Revert changes</source> + <translation>Откатить изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/> + <source>Re&vert changes</source> + <translation>От&катить изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <source>Revert all changes made to the local project</source> + <translation>Откатить все изменения в локальном проекте</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation><b>Опции командной строки...</b><p>Отображение диалога редактирования опций командной строки VCS.</p></translation> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation><b>Откатить изменения</b><p>Все изменения в локальном проекте будут отменены.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/> - <source>Revert changes</source> - <translation>Откатить изменения</translation> + <source>Merge</source> + <translation>Слить</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/> - <source>Re&vert changes</source> - <translation>От&катить изменения</translation> + <source>Mer&ge changes...</source> + <translation>С&лить изменения...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> - <source>Revert all changes made to the local project</source> - <translation>Откатить все изменения в локальном проекте</translation> + <source>Merge changes of a tag/revision into the local project</source> + <translation>Слить изменения тега/ревизии с локальным проектом</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation><b>Откатить изменения</b><p>Все изменения в локальном проекте будут отменены.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/> - <source>Merge</source> - <translation>Слить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/> - <source>Mer&ge changes...</source> - <translation>С&лить изменения...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="289"/> - <source>Merge changes of a tag/revision into the local project</source> - <translation>Слить изменения тега/ревизии с локальным проектом</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Слить</b><p>Слить изменения тега/ревизии с локальным проектом.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/> + <source>Switch</source> + <translation>Переключить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/> + <source>S&witch...</source> + <translation>Пе&реключить (switch)...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <source>Switch the local copy to another tag/branch</source> + <translation>Переключение локальной копии на другую тег/ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> + <translation><b>Переключить</b><p>Переключение локальной копии на другую тег/ветвь.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>Switch</source> - <translation>Переключить</translation> + <source>Conflicts resolved</source> + <translation>Разрешенные конфликты</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>S&witch...</source> - <translation>Пе&реключить (switch)...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> - <source>Switch the local copy to another tag/branch</source> - <translation>Переключение локальной копии на другую тег/ветвь</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> - <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> - <translation><b>Переключить</b><p>Переключение локальной копии на другую тег/ветвь.</p></translation> + <source>Con&flicts resolved</source> + <translation>Разрешенные кон&фликты</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="304"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation>Пометить выбранные конфликты как разрешенные</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="307"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation><b>Разрешенные конфликты</b><p>Пометить выбранные конфликты как разрешенные.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> - <source>Conflicts resolved</source> - <translation>Разрешенные конфликты</translation> + <source>Cleanup</source> + <translation>Очистка</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> - <source>Con&flicts resolved</source> - <translation>Разрешенные кон&фликты</translation> + <source>Cleanu&p</source> + <translation>О&чистка</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation>Пометить выбранные конфликты как разрешенные</translation> + <source>Cleanup the local project</source> + <translation>Очистить локальный проект</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="322"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation><b>Разрешенные конфликты</b><p>Пометить выбранные конфликты как разрешенные.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/> - <source>Cleanup</source> - <translation>Очистка</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/> - <source>Cleanu&p</source> - <translation>О&чистка</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> - <source>Cleanup the local project</source> - <translation>Очистить локальный проект</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="337"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Очистка</b><p>Очистить локальный проект.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>Execute command</source> <translation>Выполнить команду</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>E&xecute command...</source> <translation>В&ыполнить команду...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="333"/> <source>Execute an arbitrary VCS command</source> <translation>Выполнить произвольную команду VCS</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="336"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation><b>Выполнить команду</b><p>Открытие диалога ввода произвольной команды VCS.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/> <source>List tags</source> <translation>Список тегов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/> <source>List tags...</source> <translation>Список тегов...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> <source>List tags of the project</source> <translation>Список тегов проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="350"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Список тегов</b><p>Отображает список тегов проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches</source> <translation>Список ветвей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches...</source> <translation>Список ветвей...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="361"/> <source>List branches of the project</source> <translation>Список ветвей текущего проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="364"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Список ветвей</b><p>Отображает список ветвей текущего проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source>List repository contents</source> <translation>Список содержания репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source>List repository contents...</source> <translation>Список содержания репозитория...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="375"/> <source>Lists the contents of the repository</source> <translation>Перечисление содержания репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation><b>Список содержания репозитория<b><p>Эти списки отражают содержание репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/> <source>Set Property</source> <translation>Установить свойство</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/> <source>Set Property...</source> <translation>Установить свойство...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="389"/> <source>Set a property for the project files</source> <translation>Установить свойство файлов проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="392"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation><b>Установить свойство</b><p>Устанавливает свойство файлов проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source>List Properties</source> <translation>Список свойств</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source>List Properties...</source> <translation>Список свойств...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="403"/> <source>List properties of the project files</source> <translation>Список свойств файлов проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation><b>Список свойств</b><p>Отображает список свойств файлов проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/> <source>Delete Property</source> <translation>Удалить свойство</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/> <source>Delete Property...</source> <translation>Удалить свойство...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> + <source>Delete a property for the project files</source> + <translation>Удалить свойство для файлов проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="420"/> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation><b>Удалить свойство</b> +<p>Удаляет свойство для файлов проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/> + <source>Relocate</source> + <translation>Переместить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/> + <source>Relocate...</source> + <translation>Переместить (relocate)...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> - <source>Delete a property for the project files</source> - <translation>Удалить свойство для файлов проекта</translation> + <source>Relocate the working copy to a new repository URL</source> + <translation>Переместить рабочую копию в новый URL репозиторий</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation><b>Удалить свойство</b> -<p>Удаляет свойство для файлов проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/> - <source>Relocate</source> - <translation>Переместить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/> - <source>Relocate...</source> - <translation>Переместить (relocate)...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> - <source>Relocate the working copy to a new repository URL</source> - <translation>Переместить рабочую копию в новый URL репозиторий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>Переместить</b><p>Перемещение рабочей копии в новый URL репозиторий.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/> + <source>Repository Browser</source> + <translation>Браузер репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/> + <source>Repository Browser...</source> + <translation>Браузер репозитория...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> + <source>Show the Repository Browser dialog</source> + <translation>Отображение диалога проводника репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation><b>Браузер репозитория</b><p>Отображение браузера репозитория.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> - <source>Repository Browser</source> - <translation>Браузер репозитория</translation> + <source>Configure</source> + <translation>Настройка</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> - <source>Repository Browser...</source> - <translation>Браузер репозитория...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="463"/> - <source>Show the Repository Browser dialog</source> - <translation>Отображение диалога проводника репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="466"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation><b>Браузер репозитория</b><p>Отображение браузера репозитория.</p></translation> + <source>Configure...</source> + <translation>Настроить...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="462"/> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation>Отображение диалога настроек с выбранной страницей настроек Subversion</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="465"/> + <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> + <translation><b>Настройка</b><p>Отображение диалога настроек с выбранной страницей настроек Subversion.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/> - <source>Configure</source> - <translation>Настройка</translation> + <source>Upgrade</source> + <translation>Модернизировать</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/> - <source>Configure...</source> - <translation>Настроить...</translation> + <source>Upgrade...</source> + <translation>Модернизировать...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="477"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation>Отображение диалога настроек с выбранной страницей настроек Subversion</translation> + <source>Upgrade the working copy to the current format</source> + <translation>Модернизировать рабочую копию в текущий формат</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="480"/> - <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> - <translation><b>Настройка</b><p>Отображение диалога настроек с выбранной страницей настроек Subversion.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/> - <source>Upgrade</source> - <translation>Модернизировать</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/> - <source>Upgrade...</source> - <translation>Модернизировать...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="492"/> - <source>Upgrade the working copy to the current format</source> - <translation>Модернизировать рабочую копию в текущий формат</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="495"/> <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation><b>Модернизировать</b><p>Обновление рабочего каталога в текущий формат.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="559"/> <source>Subversion (pysvn)</source> <translation>Subversion (pysvn)</translation> </message> @@ -47705,17 +47885,17 @@ <translation>Добавить...</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="55"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="65"/> <source>Press to remove the selected documents from the database</source> <translation>Удалить выбранную документацию из базы</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="58"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="68"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="117"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="132"/> <source>Add Documentation</source> <translation>Добавить документацию</translation> </message> @@ -47725,40 +47905,50 @@ <translation>Сжатые файлы Qt справки (*.qch)</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="107"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="122"/> <source>The file <b>{0}</b> is not a valid Qt Help File.</source> <translation>Некорректный файл Qt справки: <b>{0}</b>.</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="117"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="132"/> <source>The namespace <b>{0}</b> is already registered.</source> <translation>Пространство имен <b>{0}</b> уже зарегистрировано.</translation> </message> <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="167"/> + <source>Remove Documentation</source> + <translation>Удалить документацию</translation> + </message> + <message> <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="152"/> - <source>Remove Documentation</source> - <translation>Удалить документацию</translation> - </message> - <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="137"/> <source>Do you really want to remove the selected documentation sets from the database?</source> <translation>Удалить выбранную документацию из базы?</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="152"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="167"/> <source>Some documents currently opened reference the documentation you are attempting to remove. Removing the documentation will close those documents. Remove anyway?</source> <translation>Удаление данной документации приведёт к закрытию всех открытых в данный момент документов, которые ссылаются на эту документацию. Все равно удалить?</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="78"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="55"/> <source>Press to select QtHelp documents provided by a plug-in to add to the database</source> <translation>Выбрать QtHelp документацию, поставляемую плагинами, для добавления в базу</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="81"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="58"/> <source>Add from Plug-ins...</source> <translation>Добавить из плагинов...</translation> </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="85"/> + <source>Select to manage the plug-in provided documentation sets</source> + <translation>Разрешить управление комплектами документации, поставляемой с плагинами</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="88"/> + <source>Manage Plug-ins...</source> + <translation>Управление плагинами...</translation> + </message> </context> <context> <name>QtHelpDocumentationSelectionDialog</name> @@ -47772,6 +47962,61 @@ <source>Select the documentation files to be installed:</source> <translation>Выберите файлы документации для их установки:</translation> </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="144"/> + <source>Delete Documentation Sets</source> + <translation>Удалить комплекты документации</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="91"/> + <source>Shall the selected documentation sets really be deleted?</source> + <translation>Действительно ли удалить выбранные комплекты документации?</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="107"/> + <source><p>The documentation set <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> + <translation><p>Невозможно удалить комплект документации <b>{0}</b>.</p><p>Причина: {1}</p></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="126"/> + <source>Shall the selected documentation set categories really be deleted?</source> + <translation>Действительно ли удалить комплекты документации выбранных категорий?</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="144"/> + <source>Shall all documentation sets really be deleted?</source> + <translation>Действительно ли удалить все комплекты документации?</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="56"/> + <source>Press to delete the selected documentation sets</source> + <translation>Удалить выбранные комплекты документации</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="59"/> + <source>Delete</source> + <translation>Удалить</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="66"/> + <source>Press to delete the selected category</source> + <translation>Удалить выбранные категории</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="69"/> + <source>Delete Categories</source> + <translation>Удалить категории</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="76"/> + <source>Press to delete all entries</source> + <translation>Удалить все записи</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="79"/> + <source>Delete All</source> + <translation>Удалить все</translation> + </message> </context> <context> <name>QtHelpFiltersDialog</name> @@ -47821,7 +48066,7 @@ <translation>Удалить выделенные фильтры</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="150"/> + <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="89"/> <source>Remove Filters</source> <translation>Удалить фильтры</translation> </message> @@ -47831,7 +48076,7 @@ <translation>Удалить выбранные атрибуты</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="178"/> + <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="99"/> <source>Remove Attributes</source> <translation>Удалить атрибуты</translation> </message> @@ -49044,6 +49289,19 @@ </message> </context> <context> + <name>RestructuredTextProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/RestructuredTextProvider.py" line="411"/> + <source>Create List</source> + <translation>Создать список</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/RestructuredTextProvider.py" line="411"/> + <source>Enter desired number of list elements:</source> + <translation>Задайте необходимое количество элементов списка:</translation> + </message> +</context> +<context> <name>SafariImporter</name> <message> <location filename="../WebBrowser/Bookmarks/BookmarksImporters/SafariImporter.py" line="44"/> @@ -49346,7 +49604,7 @@ <context> <name>SendRefererWhitelistDialog</name> <message> - <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.py" line="52"/> + <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.ui" line="14"/> <source>Send Referer Whitelist</source> <translation>Отправить реферер белого списка</translation> </message> @@ -50561,7 +50819,7 @@ <translation>К&опировать превью</translation> </message> <message> - <location filename="../Snapshot/SnapWidget.py" line="531"/> + <location filename="../Snapshot/SnapWidget.ui" line="20"/> <source>eric6 Snapshot</source> <translation>Снимки eric6</translation> </message> @@ -51086,7 +51344,7 @@ <message> <location filename="../SqlBrowser/SqlBrowserWidget.py" line="46"/> <source>No database drivers found</source> - <translation>Не найдено драйверов для базы данных</translation> + <translation>Не найдены драйверы для базы данных</translation> </message> <message> <location filename="../SqlBrowser/SqlBrowserWidget.py" line="46"/> @@ -52141,7 +52399,7 @@ <translation>Процесс svn завершен с кодом выхода {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1984"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1964"/> <source>The svn process did not finish within 30s.</source> <translation>Процесс svn не завершен в течение 30 секунд.</translation> </message> @@ -52231,137 +52489,127 @@ <translation>Перемещение {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/> <source>Subversion Error</source> <translation>Subversion: Ошибка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="951"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>URL репозитория проекта не может быть получен из рабочей копии. Операция установки тега будет прервана</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="998"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="978"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>URL репозитория проекта имеет недопустимый формат. Операция установки тега будет прервана</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1033"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1013"/> <source>Tagging {0} in the Subversion repository</source> <translation>Subversion: Добавление тегов '{0}' в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1056"/> <source>Reverting changes</source> <translation>Откат изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1093"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1073"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>URL репозитория проекта не может быть получен из рабочей копии. Операция переключения будет отменена</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>URL репозитория проекта имеет недопустимый формат. Операция переключения будет отменена</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1151"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1131"/> <source>Switching to {0}</source> <translation>Переключение на '{0}'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1196"/> <source>Merging {0}</source> <translation>Слияние с '{0}'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1482"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1462"/> <source>Cleaning up {0}</source> <translation>Очистка {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1512"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1492"/> <source>Subversion command</source> <translation>Subversion: Команда</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1684"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1664"/> <source>Resolving conficts</source> <translation>Разрешение конфликтов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1695"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1779"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1759"/> <source>Subversion Set Property</source> <translation>Subversion: Определение свойств</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1781"/> + <source>You have to supply a property name. Aborting.</source> + <translation>Необходимо задать имя свойства. Отмена.</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1801"/> - <source>You have to supply a property name. Aborting.</source> - <translation>Необходимо задать имя свойства. Отмена.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1821"/> <source>Subversion Delete Property</source> <translation>Subversion: Удаление свойств</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1791"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1771"/> <source>Enter property name</source> <translation>Введите имя свойства</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> - <source>Subversion Log</source> - <translation>Subversion: Журнал</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> - <source>Select number of entries to show.</source> - <translation>Задайте количество отображаемых записей.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2080"/> <source>Locking in the Subversion repository</source> <translation>Subversion: Блокировка в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2108"/> <source>Unlocking in the Subversion repository</source> <translation>Subversion: Разблокировка в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2153"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2133"/> <source>Relocating</source> <translation>Перемещение</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/> <source>Repository Browser</source> <translation>Браузер репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/> <source>Enter the repository URL.</source> <translation>Задайте URL репозитория.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2221"/> <source>Remove from changelist</source> <translation>Удалить из списка изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/> <source>Add to changelist</source> <translation>Добавить к списку изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/> <source>Enter name of the changelist:</source> <translation>Введите имя списка изменений:</translation> </message> @@ -52377,28 +52625,28 @@ <translation>Фиксированная ревизия {0}.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1255"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1234"/> <source>Revision {0}. </source> <translation>Ревизия {0}.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1923"/> <source>Property set.</source> <translation>Свойство определено.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1997"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1976"/> <source>Property deleted.</source> <translation>Свойство удалено.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/> <source>Subversion Lock</source> <translation>Subversion: Блокировка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/> <source>Enter lock comment</source> <translation>Введите комментарий блокировки</translation> </message> @@ -52578,37 +52826,37 @@ <translation>Фиксация влияет на файлы с несохраненными изменениями. Продолжить ли фиксацию?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/> <source>Revert changes</source> <translation>Откатить изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1042"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation>Вы действительно хотите откатить все изменения в этих файлах и директориях?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/> <source>Do you really want to revert all changes of the project?</source> <translation>Вы действительно хотите откатить все изменения в проекте?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1987"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1967"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/> <source>Subversion Side-by-Side Difference</source> <translation>Subversion: Построчный просмотр различий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл: <b>{0}</b></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2305"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2285"/> <source>Upgrade</source> <translation>Модернизировать</translation> </message> @@ -53174,7 +53422,7 @@ <context> <name>SvnDiffDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="14"/> <source>Subversion Diff</source> <translation>Subversion: Отображение различий</translation> </message> @@ -53477,17 +53725,17 @@ <translation>Выберите поле, по которому фильтровать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="112"/> <source>Revision</source> <translation>Ревизия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="117"/> <source>Author</source> <translation>Автор</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="127"/> <source>Message</source> <translation>Сообщение</translation> </message> @@ -53547,257 +53795,130 @@ <translation>Стоп при копировании/перемещении</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="261"/> <source>Press to generate a diff to the previous revision</source> <translation>Генерация различий с предыдущей ревизией</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="264"/> <source>&Diff to Previous</source> <translation>&Различие с предыдущей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="271"/> <source>Press to compare two revisions</source> <translation>Сравнить две ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="254"/> - <source>&Compare Revisions</source> - <translation>&Сравнить ревизии</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="292"/> - <source>Errors</source> - <translation>Ошибки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="298"/> - <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> - <translation><b>Subversion: Ошибки log</b> -<p>Отображение возможных ошибок команды <tt>cvn log</tt>.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="314"/> - <source>Input</source> - <translation>Ввод</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="336"/> - <source>Press to send the input to the subversion process</source> - <translation>Отправить данные процессу subversion</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/> - <source>&Send</source> - <translation>&Отправить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="349"/> - <source>Enter data to be sent to the subversion process</source> - <translation>Введите данные для отправки процессу subversion</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> - <source>Select to switch the input field to password mode</source> - <translation>Задать режим ввода пароля для поля ввода пароля</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> - <source>&Password Mode</source> - <translation>&Парольный режим</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="89"/> - <source>Added</source> - <translation>Добавлен</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="90"/> - <source>Deleted</source> - <translation>Удален</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="91"/> - <source>Modified</source> - <translation>Модифицирован</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="504"/> - <source>Subversion Error</source> - <translation>Subversion: Ошибка</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> - <source>Process Generation Error</source> - <translation>Ошибка при запуске процесса</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="92"/> - <source>Replaced</source> - <translation>Заменено</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> - <source>Select to show differences side-by-side</source> - <translation>Разрешить построчный показ различий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="277"/> - <source>Show differences side-by-side</source> - <translation>Показывать различия построчно</translation> - </message> -</context> -<context> - <name>SvnLogDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="14"/> - <source>Subversion Log</source> - <translation>Subversion: Журнал</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="26"/> - <source>Log</source> - <translation>История ревизий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="32"/> - <source><b>Subversion Log</b><p>This shows the output of the svn log command. By clicking on the links you may show the difference between versions.</p></source> - <translation><b>Subversion: Журнал </b><p>Отображение вывода команды cvn log. Кликнув по ссылке Вы можете увидеть различия между ревизиями.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="58"/> + <source>&Compare Revisions</source> + <translation>&Сравнить ревизии</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="312"/> <source>Errors</source> <translation>Ошибки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="64"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="318"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> - <translation><b>Subversion: Ошибки log</b><p>Отображение возможных ошибок команды <tt>cvn log</tt>.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="80"/> + <translation><b>Subversion: Ошибки log</b> +<p>Отображение возможных ошибок команды <tt>cvn log</tt>.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="334"/> <source>Input</source> <translation>Ввод</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> <source>Press to send the input to the subversion process</source> <translation>Отправить данные процессу subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> <source>&Send</source> <translation>&Отправить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="108"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="369"/> <source>Enter data to be sent to the subversion process</source> <translation>Введите данные для отправки процессу subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="122"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="376"/> <source>Select to switch the input field to password mode</source> <translation>Задать режим ввода пароля для поля ввода пароля</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="379"/> <source>&Password Mode</source> <translation>&Парольный режим</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="382"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="55"/> - <source><b>Processing your request, please wait...</b></source> - <translation><b>Запрос обрабатывается, пожалуйста, ждите...</b></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="81"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="93"/> <source>Added</source> <translation>Добавлен</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="82"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="94"/> <source>Deleted</source> <translation>Удален</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="83"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="95"/> <source>Modified</source> <translation>Модифицирован</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="87"/> - <source>revision</source> - <translation>ревизия</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="527"/> + <source>Subversion Error</source> + <translation>Subversion: Ошибка</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="313"/> <source>Process Generation Error</source> <translation>Ошибка при запуске процесса</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="313"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="193"/> - <source>diff to {0}</source> - <translation>различия с {0}</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="202"/> - <source><i>author: {0}</i><br /> -</source> - <translation><i>автор: {0}</i><br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="205"/> - <source><i>date: {0}</i><br /> -</source> - <translation><i>дата: {0}</i><br /> -</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="191"/> - <source> (copied from {0}, revision {1})</source> - <translation> (скопировано с {0}, ревизии {1})</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="42"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="96"/> + <source>Replaced</source> + <translation>Заменено</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="294"/> <source>Select to show differences side-by-side</source> <translation>Разрешить построчный показ различий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="297"/> <source>Show differences side-by-side</source> - <translation>Показать различия построчно</translation> + <translation>Показывать различия построчно</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <source>Press to move up in the log list</source> + <translation>Перейти выше в списке сообщений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <source>Press to move down in the log list</source> + <translation>Перейти ниже в списке сообщений</translation> </message> </context> <context> @@ -53950,7 +54071,7 @@ <translation><b>URL</b><p>Задайте URL модуля. Репозиторий со стандартной раскладкой не должен содержать части trunk, tags или branches.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/> <source>&URL:</source> <translation>&URL репозитория:</translation> </message> @@ -54045,7 +54166,7 @@ <translation>Задайте протокол доступа к репозиторию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/> <source>&URL:</source> <translation>&URL репозитория:</translation> </message> @@ -54090,177 +54211,172 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="634"/> <source>Version Control</source> <translation>Контроль версий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="654"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="646"/> <source>Update from repository</source> <translation>Обновить из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="658"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="650"/> <source>Commit changes to repository...</source> <translation>Фиксация изменений в репозитории...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="656"/> <source>Add to repository</source> <translation>Добавить в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="385"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="381"/> <source>Add tree to repository</source> <translation>Добавить дерево в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="660"/> <source>Remove from repository (and disk)</source> <translation>Удаление из репозитория (и с диска)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="667"/> <source>Add to Changelist</source> <translation>Добавить к списку изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="679"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="671"/> <source>Remove from Changelist</source> <translation>Удалить из списка изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="566"/> - <source>Show log</source> - <translation>Показать историю ревизий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="562"/> <source>Show log browser</source> <translation>Показать браузер журнала</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="684"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="676"/> <source>Show status</source> <translation>Показать статус</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="286"/> <source>Show annotated file</source> <translation>Показать файл аннотаций</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="696"/> <source>Revert changes</source> <translation>Откатить изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="708"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="700"/> <source>Merge changes</source> <translation>Слияние изменений</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="430"/> + <source>Lock</source> + <translation>Блокировать</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="434"/> - <source>Lock</source> - <translation>Блокировать</translation> + <source>Unlock</source> + <translation>Снять блокировку</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="438"/> - <source>Unlock</source> - <translation>Снять блокировку</translation> + <source>Break Lock</source> + <translation>Прервать блокировку</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="442"/> - <source>Break Lock</source> - <translation>Прервать блокировку</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="446"/> <source>Steal Lock</source> <translation>Перехватить блокировку</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="708"/> + <source>Set Property</source> + <translation>Установить свойство</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="710"/> + <source>List Properties</source> + <translation>Список свойств</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="713"/> + <source>Delete Property</source> + <translation>Удалить свойство</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="716"/> - <source>Set Property</source> - <translation>Установить свойство</translation> + <source>Select all local file entries</source> + <translation>Выделить все локальные записи файла</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="718"/> - <source>List Properties</source> - <translation>Список свойств</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="721"/> - <source>Delete Property</source> - <translation>Удалить свойство</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="724"/> - <source>Select all local file entries</source> - <translation>Выделить все локальные записи файла</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="726"/> <source>Select all versioned file entries</source> <translation>Выделить все версированные записи файла</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="720"/> <source>Select all local directory entries</source> <translation>Выделить все локальные записи директории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="730"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="722"/> <source>Select all versioned directory entries</source> <translation>Выделить все версированные записи директории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="733"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="725"/> <source>Configure...</source> <translation>Настроить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="572"/> <source>Show repository info</source> <translation>Показать информацию о репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="547"/> <source>Copy</source> <translation>Копировать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="549"/> <source>Move</source> <translation>Переместить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="681"/> <source>Show differences</source> <translation>Показать различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="271"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="267"/> <source>Show differences side-by-side</source> <translation>Показать различия построчно</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="693"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="685"/> <source>Show differences (extended)</source> <translation>Показать различия (подробно)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="276"/> <source>Show differences side-by-side (extended)</source> <translation>Показать различия построчно (подробно)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="698"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="690"/> <source>Show differences (URLs)</source> <translation>Показать различия (URLs)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="712"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/> <source>Conflicts resolved</source> <translation>Разрешенные конфликты</translation> </message> @@ -54329,506 +54445,486 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/> - <source>Show log</source> - <translation>Показать историю ревизий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/> - <source>Show &log</source> - <translation>Показать &историю ревизий</translation> + <source>Show log browser</source> + <translation>Показать браузер журнала</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="104"/> - <source>Show the log of the local project</source> - <translation>Показать историю изменений локального проекта</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation>Отображение диалога просмотра журнала локального проекта</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="107"/> - <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation><b>Показать историю</b><p>Отображение истории изменений локального проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="114"/> - <source>Show log browser</source> - <translation>Показать браузер журнала</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="119"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>Отображение диалога просмотра журнала локального проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="122"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Показать браузер журнала</b><p>Отображение диалога просмотра журнала локального проекта. Изначально показывается ограниченное количество записей. Следующие записи могут быть получены дополнительно.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/> <source>Show &difference</source> <translation>Показать &различие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="121"/> <source>Show the difference of the local project to the repository</source> <translation>Показать различие локального проекта и репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="137"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Показать различие ревизий проекта в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="153"/> <source>Show the difference of the project between two repository URLs</source> <translation>Показать различие проекта двух URLs репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="164"/> <source>Show status</source> <translation>Показать статус</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="164"/> <source>Show &status</source> <translation>Показать &статус</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="169"/> <source>Show the status of the local project</source> <translation>Показать статус локального проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="172"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Показать статус</b><p>Отображение статуса локального проекта.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="195"/> + <source>Tag in repository</source> + <translation>Тег в репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="195"/> + <source>&Tag in repository...</source> + <translation>&Тег в репозитории...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="200"/> + <source>Tag the local project in the repository</source> + <translation>Тег локального проекта в репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="203"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Тег в репозитории</b><p>Это теги локального проекта в репозитории.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="210"/> - <source>Tag in repository</source> - <translation>Тег в репозитории</translation> + <source>Export from repository</source> + <translation>Экспорт из репозитория</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="210"/> - <source>&Tag in repository...</source> - <translation>&Тег в репозитории...</translation> + <source>&Export from repository...</source> + <translation>&Экспорт из репозитория...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="215"/> - <source>Tag the local project in the repository</source> - <translation>Тег локального проекта в репозитории</translation> + <source>Export a project from the repository</source> + <translation>Экспорт проекта из репозитория</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="218"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Тег в репозитории</b><p>Это теги локального проекта в репозитории.</p></translation> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>Экспорт из репозитория</b><p>Экспорт проекта из репозитория.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/> - <source>Export from repository</source> - <translation>Экспорт из репозитория</translation> + <source>Command options</source> + <translation>Опции командной строки</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/> - <source>&Export from repository...</source> - <translation>&Экспорт из репозитория...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="230"/> - <source>Export a project from the repository</source> - <translation>Экспорт проекта из репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="233"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation><b>Экспорт из репозитория</b><p>Экспорт проекта из репозитория.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="240"/> - <source>Command options</source> - <translation>Опции командной строки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="240"/> <source>Command &options...</source> <translation>&Опции командной строки...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="229"/> <source>Show the VCS command options</source> <translation>Показать опции командной строки VCS</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="231"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation><b>Опции командной строки...</b><p>Отображение диалога редактирования опций командной строки VCS.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="238"/> + <source>Revert changes</source> + <translation>Откат изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="238"/> + <source>Re&vert changes</source> + <translation>От&кат изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="243"/> + <source>Revert all changes made to the local project</source> + <translation>Откат всех изменений в локальном проекте</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="246"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation><b>Опции командной строки...</b><p>Отображение диалога редактирования опций командной строки VCS.</p></translation> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation><b>Откат изменений</b><p>Откат всех изменений в локальном проекте.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/> - <source>Revert changes</source> - <translation>Откат изменений</translation> + <source>Merge</source> + <translation>Слить</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/> - <source>Re&vert changes</source> - <translation>От&кат изменений</translation> + <source>Mer&ge changes...</source> + <translation>С&лить изменения...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="258"/> - <source>Revert all changes made to the local project</source> - <translation>Откат всех изменений в локальном проекте</translation> + <source>Merge changes of a tag/revision into the local project</source> + <translation>Слить изменения тега/ревизии с локальным проектом</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="261"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation><b>Откат изменений</b><p>Откат всех изменений в локальном проекте.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="268"/> - <source>Merge</source> - <translation>Слить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="268"/> - <source>Mer&ge changes...</source> - <translation>С&лить изменения...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="273"/> - <source>Merge changes of a tag/revision into the local project</source> - <translation>Слить изменения тега/ревизии с локальным проектом</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="276"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Слить</b><p>Слияние изменений тега/ревизии с локальным проектом.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="269"/> <source>Switch</source> <translation>Переключиться</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="269"/> + <source>S&witch...</source> + <translation>Пе&реключиться (switch)...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="274"/> + <source>Switch the local copy to another tag/branch</source> + <translation>Переключить локальную копию на другую тег/ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="277"/> + <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> + <translation><b>Переключиться</b><p>Переключение локальной копии на другую тег/ветвь.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> + <source>Cleanup</source> + <translation>Очистка</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> + <source>Cleanu&p</source> + <translation>О&чистка</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="303"/> + <source>Cleanup the local project</source> + <translation>Очистить локальный проект</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="306"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Очистка</b><p>Выполнение очистки локального проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="313"/> + <source>Execute command</source> + <translation>Выполнить команду</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="313"/> + <source>E&xecute command...</source> + <translation>В&ыполнить команду...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="317"/> + <source>Execute an arbitrary VCS command</source> + <translation>Выполнить произвольную команду VCS</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="320"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> + <translation><b>Выполнить команду</b><p>Открытие диалога ввода произвольной команды VCS.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="327"/> + <source>List tags</source> + <translation>Список тегов</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="327"/> + <source>List tags...</source> + <translation>Список тегов...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="331"/> + <source>List tags of the project</source> + <translation>Список тегов проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="334"/> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Список тегов</b><p>Отображение списка тегов проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="341"/> + <source>List branches</source> + <translation>Список ветвей</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="341"/> + <source>List branches...</source> + <translation>Список ветвей...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="345"/> + <source>List branches of the project</source> + <translation>Список ветвей текущего проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="348"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Список ветвей</b><p>Отображение списка ветвей текущего проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="355"/> + <source>List repository contents</source> + <translation>Список содержания репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="355"/> + <source>List repository contents...</source> + <translation>Список содержания репозитория...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="359"/> + <source>Lists the contents of the repository</source> + <translation>Перечисление содержания репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="362"/> + <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> + <translation><b>Список содержания репозитория<b><p>Эти списки отражают содержание репозитория.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="369"/> + <source>Set Property</source> + <translation>Установить свойство</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="369"/> + <source>Set Property...</source> + <translation>Установить свойство...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="373"/> + <source>Set a property for the project files</source> + <translation>Установить свойство файлов проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="376"/> + <source><b>Set Property</b><p>This sets a property for the project files.</p></source> + <translation><b>Установить свойство</b><p>Задание свойства файлов проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="383"/> + <source>List Properties</source> + <translation>Список свойств</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="383"/> + <source>List Properties...</source> + <translation>Список свойств...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="387"/> + <source>List properties of the project files</source> + <translation>Список свойств файлов проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="390"/> + <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> + <translation><b>Список свойств</b><p>Отображение списка свойств файлов проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="397"/> + <source>Delete Property</source> + <translation>Удалить свойство</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="397"/> + <source>Delete Property...</source> + <translation>Удалить свойство...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="401"/> + <source>Delete a property for the project files</source> + <translation>Удалить свойство файлов проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="404"/> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation><b>Удалить свойство</b><p>Удаление свойства файлов проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/> + <source>Relocate</source> + <translation>Переместить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/> + <source>Relocate...</source> + <translation>Переместить (relocate)...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="416"/> + <source>Relocate the working copy to a new repository URL</source> + <translation>Переместить рабочую копию в новый URL репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="419"/> + <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> + <translation><b>Переместить</b><p>Перемещение рабочей копии в новый URL репозиторий.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="427"/> + <source>Repository Browser</source> + <translation>Браузер репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="427"/> + <source>Repository Browser...</source> + <translation>Браузер репозитория...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="432"/> + <source>Show the Repository Browser dialog</source> + <translation>Отображение диалога браузера репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="435"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation><b>Браузер репозитория</b><p>Отображение браузера репозитория.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> + <source>Configure</source> + <translation>Настроить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> + <source>Configure...</source> + <translation>Настроить...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="446"/> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation>Отображение диалога конфигурации с выбранной страницей настроек Subversion</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="449"/> + <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> + <translation><b>Настройка</b><p>Отображение диалога конфигурации с выбранной страницей настроек Subversion.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> - <source>S&witch...</source> - <translation>Пе&реключиться (switch)...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="289"/> - <source>Switch the local copy to another tag/branch</source> - <translation>Переключить локальную копию на другую тег/ветвь</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="292"/> - <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> - <translation><b>Переключиться</b><p>Переключение локальной копии на другую тег/ветвь.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="314"/> - <source>Cleanup</source> - <translation>Очистка</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="314"/> - <source>Cleanu&p</source> - <translation>О&чистка</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="318"/> - <source>Cleanup the local project</source> - <translation>Очистить локальный проект</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="321"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Очистка</b><p>Выполнение очистки локального проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="328"/> - <source>Execute command</source> - <translation>Выполнить команду</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="328"/> - <source>E&xecute command...</source> - <translation>В&ыполнить команду...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="332"/> - <source>Execute an arbitrary VCS command</source> - <translation>Выполнить произвольную команду VCS</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="335"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> - <translation><b>Выполнить команду</b><p>Открытие диалога ввода произвольной команды VCS.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="342"/> - <source>List tags</source> - <translation>Список тегов</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="342"/> - <source>List tags...</source> - <translation>Список тегов...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="346"/> - <source>List tags of the project</source> - <translation>Список тегов проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="349"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Список тегов</b><p>Отображение списка тегов проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="356"/> - <source>List branches</source> - <translation>Список ветвей</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="356"/> - <source>List branches...</source> - <translation>Список ветвей...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="360"/> - <source>List branches of the project</source> - <translation>Список ветвей текущего проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="363"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Список ветвей</b><p>Отображение списка ветвей текущего проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="370"/> - <source>List repository contents</source> - <translation>Список содержания репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="370"/> - <source>List repository contents...</source> - <translation>Список содержания репозитория...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="374"/> - <source>Lists the contents of the repository</source> - <translation>Перечисление содержания репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="377"/> - <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> - <translation><b>Список содержания репозитория<b><p>Эти списки отражают содержание репозитория.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="384"/> - <source>Set Property</source> - <translation>Установить свойство</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="384"/> - <source>Set Property...</source> - <translation>Установить свойство...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="388"/> - <source>Set a property for the project files</source> - <translation>Установить свойство файлов проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="391"/> - <source><b>Set Property</b><p>This sets a property for the project files.</p></source> - <translation><b>Установить свойство</b><p>Задание свойства файлов проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="398"/> - <source>List Properties</source> - <translation>Список свойств</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="398"/> - <source>List Properties...</source> - <translation>Список свойств...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="402"/> - <source>List properties of the project files</source> - <translation>Список свойств файлов проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="405"/> - <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> - <translation><b>Список свойств</b><p>Отображение списка свойств файлов проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="412"/> - <source>Delete Property</source> - <translation>Удалить свойство</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="412"/> - <source>Delete Property...</source> - <translation>Удалить свойство...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="416"/> - <source>Delete a property for the project files</source> - <translation>Удалить свойство файлов проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="419"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation><b>Удалить свойство</b><p>Удаление свойства файлов проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="426"/> - <source>Relocate</source> - <translation>Переместить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="426"/> - <source>Relocate...</source> - <translation>Переместить (relocate)...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="431"/> - <source>Relocate the working copy to a new repository URL</source> - <translation>Переместить рабочую копию в новый URL репозиторий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="434"/> - <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> - <translation><b>Переместить</b><p>Перемещение рабочей копии в новый URL репозиторий.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> - <source>Repository Browser</source> - <translation>Браузер репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> - <source>Repository Browser...</source> - <translation>Браузер репозитория...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="447"/> - <source>Show the Repository Browser dialog</source> - <translation>Отображение диалога браузера репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="450"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation><b>Браузер репозитория</b><p>Отображение браузера репозитория.</p></translation> + <source>Conflicts resolved</source> + <translation>Разрешенные конфликты</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> + <source>Con&flicts resolved</source> + <translation>Разрешенные кон&фликты</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="288"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation>Пометить выбранные конфликты как разрешенные</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="291"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation><b>Разрешенные конфликты</b><p>Пометка выбранных конфликтов как разрешенных.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <source>Show change lists</source> + <translation>Показать списки изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="184"/> + <source>Show the change lists and associated files of the local project</source> + <translation>Показать списки изменений и соответствующие файлы локального проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="187"/> + <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> + <translation><b>Показать списки изменений</b><p>Отображение списков изменений и соответствующих файлов локального проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> + <source>Upgrade</source> + <translation>Модернизировать</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> - <source>Configure</source> - <translation>Настроить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> - <source>Configure...</source> - <translation>Настроить...</translation> + <source>Upgrade...</source> + <translation>Модернизировать...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="461"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation>Отображение диалога конфигурации с выбранной страницей настроек Subversion</translation> + <source>Upgrade the working copy to the current format</source> + <translation>Модернизировать рабочую копию в текущий формат</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="464"/> - <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> - <translation><b>Настройка</b><p>Отображение диалога конфигурации с выбранной страницей настроек Subversion.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> - <source>Conflicts resolved</source> - <translation>Разрешенные конфликты</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> - <source>Con&flicts resolved</source> - <translation>Разрешенные кон&фликты</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="303"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation>Пометить выбранные конфликты как разрешенные</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="306"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation><b>Разрешенные конфликты</b><p>Пометка выбранных конфликтов как разрешенных.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="194"/> - <source>Show change lists</source> - <translation>Показать списки изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="199"/> - <source>Show the change lists and associated files of the local project</source> - <translation>Показать списки изменений и соответствующие файлы локального проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="202"/> - <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> - <translation><b>Показать списки изменений</b><p>Отображение списков изменений и соответствующих файлов локального проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="472"/> - <source>Upgrade</source> - <translation>Модернизировать</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="472"/> - <source>Upgrade...</source> - <translation>Модернизировать...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="476"/> - <source>Upgrade the working copy to the current format</source> - <translation>Модернизировать рабочую копию в текущий формат</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="479"/> <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation><b>Модернизировать</b><p>Обновление рабочего каталога в текущий формат.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/> <source>Show differences</source> <translation>Показать различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="132"/> <source>Show differences (extended)</source> <translation>Показать различия (подробно)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="148"/> <source>Show differences (URLs)</source> <translation>Показать различия (URLs)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="124"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation><b>Показать различия</b><p>Отображение различий локального проекта относительно репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="140"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation><b>Показать различия (подробно)</b><p>Отображение различий выделеных ревизий проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="156"/> <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> <translation><b>Показать различия (URLs)</b><p>Отображение различий проектов двух URLs репозиториев.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="559"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="543"/> <source>Subversion (svn)</source> <translation>Subversion (svn)</translation> </message> @@ -55255,7 +55351,7 @@ <context> <name>SvnStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="394"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="14"/> <source>Subversion Status</source> <translation>Subversion: Статус</translation> </message> @@ -55532,7 +55628,7 @@ <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="711"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="80"/> <source>Commit</source> <translation>Фиксация</translation> </message> @@ -59112,22 +59208,22 @@ <translation>Все</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="66"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="62"/> <source>Language:</source> <translation>Язык:</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="70"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="69"/> <source>GROUP</source> <translation>GROUP</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="103"/> <source>Close dialog</source> <translation>Закрыть диалог</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="103"/> <source>Do you really want to close the dialog?</source> <translation>Вы действительно хотите закрыть диалог?</translation> </message> @@ -60764,7 +60860,7 @@ <context> <name>UnittestDialog</name> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.ui" line="14"/> <source>Unittest</source> <translation>Unittest</translation> </message> @@ -60953,57 +61049,57 @@ <translation>^Ошибка:</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="202"/> + <location filename="../PyUnit/UnittestDialog.py" line="205"/> <source>Python3 Files ({1});;Python2 Files ({0});;All Files (*)</source> <translation>Файлы Python3 ({1});;Python2 файлы ({0});;Все файлы (*)</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="206"/> + <location filename="../PyUnit/UnittestDialog.py" line="209"/> <source>Python Files (*.py);;All Files (*)</source> <translation>Файлы Python (*.py);;Все файлы (*)</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="266"/> + <location filename="../PyUnit/UnittestDialog.py" line="269"/> <source>You must enter a test suite file.</source> <translation>Необходимо ввести имя файла с пакетом тестов.</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="274"/> + <location filename="../PyUnit/UnittestDialog.py" line="277"/> <source>Preparing Testsuite</source> <translation>Подготовка пакета тестов</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.py" line="403"/> <source><p>Unable to run test <b>{0}</b>.<br>{1}<br>{2}</p></source> <translation><p>Невозможно запустить тест <b>{0}</b>.<br>{1}<br>{2}</p></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="469"/> + <location filename="../PyUnit/UnittestDialog.py" line="475"/> <source>Running</source> <translation>Выполяется</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="493"/> + <location filename="../PyUnit/UnittestDialog.py" line="499"/> <source>Ran {0} test in {1:.3f}s</source> <translation>Тест {0} пройден за {1:.3f} секунд</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="497"/> + <location filename="../PyUnit/UnittestDialog.py" line="503"/> <source>Ran {0} tests in {1:.3f}s</source> <translation>{0} Тестов пройдено за {1:.3f} секунд</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="514"/> + <location filename="../PyUnit/UnittestDialog.py" line="520"/> <source>Failure: {0}</source> <translation>Неудача: {0}</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="529"/> + <location filename="../PyUnit/UnittestDialog.py" line="535"/> <source>Error: {0}</source> <translation>Ошибка: {0}</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="634"/> + <location filename="../PyUnit/UnittestDialog.py" line="640"/> <source>Show Source</source> <translation>Показ исходников</translation> </message> @@ -61038,17 +61134,17 @@ <translation>Количество неожиданных успехов в тестах</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="544"/> + <location filename="../PyUnit/UnittestDialog.py" line="550"/> <source> Skipped: {0}</source> <translation> Пропущено: {0}</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="559"/> + <location filename="../PyUnit/UnittestDialog.py" line="565"/> <source> Expected Failure</source> <translation> Ожидаемая неудача</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="573"/> + <location filename="../PyUnit/UnittestDialog.py" line="579"/> <source> Unexpected Success</source> <translation> Неожиданный успех</translation> </message> @@ -63436,7 +63532,7 @@ <context> <name>Utilities</name> <message> - <location filename="../Utilities/__init__.py" line="1400"/> + <location filename="../Utilities/__init__.py" line="1403"/> <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> @@ -63666,43 +63762,48 @@ </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="38"/> - <source>&Locals Filter</source> - <translation>Фильтр &локальных переменных</translation> + <source>&Locals Viewer</source> + <translation>Обзор &локальных переменных</translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="48"/> - <source>&Globals Filter</source> - <translation>Фильтр &глобальных переменных</translation> + <source>&Globals Viewer</source> + <translation>Обзор &глобальных переменных</translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="58"/> <source>Locals Filter List</source> - <translation>Фильтр локальных переменных</translation> + <translation>Список локальных фильтров</translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="61"/> <source><b>Locals Filter List</b> -<p>Select the variable types you want to be filtered out of the locals variables list.</p<</source> - <translation><b>Фильтр локальных переменных</b> -<p>Выберите, какие переменные не будут отображены в списке локальных переменных.</p></translation> +<p>Select the variable types you want to be shown in the local variables viewer.</p<</source> + <translation><b>Список локальных фильтров</b> +<p>Выбор типов переменные для отображения в окне локальных переменных.</p></translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="78"/> <source>Globals Filter List</source> - <translation>Фильтр глобальных переменных</translation> + <translation>Список глобальных фильтров</translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="81"/> <source><b>Globals Filter List</b> -<p>Select the variable types you want to be filtered out of the globals variables list.</p<</source> - <translation><b>Фильтр глобальных переменных</b> -<p>Выберите, какие переменные не будут отображены в списке глобальных переменных.</p></translation> +<p>Select the variable types you want to be shown in the global variables viewer.</p<</source> + <translation><b>Список глобальных фильтров</b> +<p>Выбор типов переменных для отображения в окне глобальных переменных.</p></translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.py" line="42"/> <source>Save Default</source> <translation>Сохранить как умолчание</translation> </message> + <message> + <location filename="../Debugger/VariablesFilterDialog.ui" line="28"/> + <source>Select the variable types to be shown in the variables viewers:</source> + <translation>Выберите типы переменных которые будут отображаться в окнах просмотра переменных:</translation> + </message> </context> <context> <name>VariablesViewer</name> @@ -64280,7 +64381,7 @@ <translation>Обновить</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="532"/> + <location filename="../VCS/ProjectHelper.py" line="533"/> <source>The project should be reread. Do this now?</source> <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> </message> @@ -64295,7 +64396,7 @@ <translation>Вы действительно хотите удалить этот проект и из репозитория (и с диска)?</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="532"/> + <location filename="../VCS/ProjectHelper.py" line="533"/> <source>Switch</source> <translation>Переключиться</translation> </message> @@ -64375,17 +64476,17 @@ <context> <name>VersionControl</name> <message> - <location filename="../VCS/VersionControl.py" line="573"/> + <location filename="../VCS/VersionControl.py" line="563"/> <source>Process Generation Error</source> <translation>Ошибка при запуске процесса</translation> </message> <message> - <location filename="../VCS/VersionControl.py" line="573"/> + <location filename="../VCS/VersionControl.py" line="563"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> </message> <message> - <location filename="../VCS/VersionControl.py" line="704"/> + <location filename="../VCS/VersionControl.py" line="694"/> <source>Repository status checking is switched off</source> <translation>Проверка статуса репозитория отключена</translation> </message> @@ -71656,24 +71757,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1459"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1426"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Предок #{0}</b></td><td></td></tr> <tr><td><b>Изменения</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Теги</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Ветви</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1446"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -71683,23 +71784,23 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Вершина</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Набор изменений</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -71710,12 +71811,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Закладки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -71732,14 +71833,14 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2078"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Заголовок #{0}</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2083"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Предок #{0}</b></td><td></td></tr></translation> @@ -72246,50 +72347,55 @@ <translation>используйте 'isinstance()' вместо сравнения типов</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="240"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="243"/> <source>do not assign a lambda expression, use a def</source> <translation>не назначайте лямбда-выражение, используйте def</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="243"/> - <source>ambiguous variable name '{0}'</source> - <translation>неоднозначное имя переменной '{0}'</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="246"/> - <source>ambiguous class definition '{0}'</source> - <translation>неоднозначное определение класса '{0}'</translation> + <source>ambiguous variable name '{0}'</source> + <translation>неоднозначное имя переменной '{0}'</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="249"/> - <source>ambiguous function definition '{0}'</source> - <translation>неоднозначное определение функции '{0}'</translation> + <source>ambiguous class definition '{0}'</source> + <translation>неоднозначное определение класса '{0}'</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="252"/> - <source>{0}: {1}</source> - <translation>{0}: {1}</translation> + <source>ambiguous function definition '{0}'</source> + <translation>неоднозначное определение функции '{0}'</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="255"/> + <source>{0}: {1}</source> + <translation>{0}: {1}</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="258"/> <source>{0}</source> <translation>{0}</translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="240"/> + <source>do not use bare except</source> + <translation>не используйте bare except</translation> + </message> </context> <context> <name>subversion</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1606"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1586"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Информация о репозитории</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Текущая ревизия</b></td><td>{2}</td></tr><tr><td><b>Фиксированная ревизия </b></td><td>{3}</td></tr><tr><td><b>Дата сохранения</b></td><td>{4}</td></tr><tr><td><b>Время сохранения</b></td><td>{5}</td></tr><tr><td><b>Последний автор</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1741"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1720"/> <source>unknown</source> <translation>неизвестный</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1746"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1725"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Информация о репозитории</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Текущая ревизия</b></td><td>{4}</td></tr><tr><td><b>Фиксированная ревизия</b></td><td>{5}</td></tr><tr><td><b>Дата сохранения</b></td><td>{6}</td></tr><tr><td><b>Время сохранения</b></td><td>{7}</td></tr><tr><td><b>Последний автор</b></td><td>{8}</td></tr></table></translation> </message>
diff -r 852016bbdedb -r c307358a2ecc i18n/eric6_tr.ts --- a/i18n/eric6_tr.ts Fri Jan 27 19:18:52 2017 +0100 +++ b/i18n/eric6_tr.ts Fri Feb 03 19:20:59 2017 +0100 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.1" language="tr_TR"> +<!DOCTYPE TS><TS version="2.0" language="tr_TR" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -1995,8 +1994,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="145"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>Yeni Bir Sekme A&ç Ctrl+LMB</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Yeni Bir Sekme A&ç<byte value="x9"/>Ctrl+LMB</translation> </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="151"/> @@ -2015,7 +2014,7 @@ </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="166"/> - <source>Open in New Tab Ctrl+LMB</source> + <source>Open in New Tab<byte value="x9"/>Ctrl+LMB</source> <translation type="unfinished"></translation> </message> <message> @@ -2084,8 +2083,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="93"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>Yeni Bir Sekme A&ç Ctrl+LMB</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Yeni Bir Sekme A&ç<byte value="x9"/>Ctrl+LMB</translation> </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="99"/> @@ -2114,7 +2113,7 @@ </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="91"/> - <source>Open in New Tab Ctrl+LMB</source> + <source>Open in New Tab<byte value="x9"/>Ctrl+LMB</source> <translation type="unfinished"></translation> </message> <message> @@ -3584,231 +3583,233 @@ <context> <name>CodeStyleFixer</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="494"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> <source>Triple single quotes converted to triple double quotes.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> - <source>Introductory quotes corrected to be {0}"""</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="500"/> - <source>Single line docstring put on one line.</source> + <source>Introductory quotes corrected to be {0}"""</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="503"/> + <source>Single line docstring put on one line.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="506"/> <source>Period added to summary line.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> <source>Blank line before function/method docstring removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="509"/> - <source>Blank line inserted before class docstring.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="512"/> - <source>Blank line inserted after class docstring.</source> + <source>Blank line inserted before class docstring.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="515"/> - <source>Blank line inserted after docstring summary.</source> + <source>Blank line inserted after class docstring.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="518"/> - <source>Blank line inserted after last paragraph of docstring.</source> + <source>Blank line inserted after docstring summary.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="521"/> - <source>Leading quotes put on separate line.</source> + <source>Blank line inserted after last paragraph of docstring.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="524"/> - <source>Trailing quotes put on separate line.</source> + <source>Leading quotes put on separate line.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="527"/> + <source>Trailing quotes put on separate line.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> <source>Blank line before class docstring removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> - <source>Blank line after class docstring removed.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="536"/> - <source>Blank line after function/method docstring removed.</source> + <source>Blank line after class docstring removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="539"/> - <source>Blank line after last paragraph removed.</source> + <source>Blank line after function/method docstring removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="542"/> - <source>Tab converted to 4 spaces.</source> + <source>Blank line after last paragraph removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="545"/> - <source>Indentation adjusted to be a multiple of four.</source> + <source>Tab converted to 4 spaces.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="548"/> - <source>Indentation of continuation line corrected.</source> + <source>Indentation adjusted to be a multiple of four.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="551"/> - <source>Indentation of closing bracket corrected.</source> + <source>Indentation of continuation line corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="554"/> - <source>Missing indentation of continuation line corrected.</source> + <source>Indentation of closing bracket corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="557"/> - <source>Closing bracket aligned to opening bracket.</source> + <source>Missing indentation of continuation line corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="560"/> - <source>Indentation level changed.</source> + <source>Closing bracket aligned to opening bracket.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="563"/> - <source>Indentation level of hanging indentation changed.</source> + <source>Indentation level changed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="566"/> + <source>Indentation level of hanging indentation changed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="569"/> <source>Visual indentation corrected.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="584"/> + <source>Extraneous whitespace removed.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="581"/> - <source>Extraneous whitespace removed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="578"/> <source>Missing whitespace added.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="584"/> - <source>Whitespace around comment sign corrected.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="587"/> + <source>Whitespace around comment sign corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="590"/> <source>One blank line inserted.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="591"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> <source>%n blank line(s) inserted.</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="597"/> <source>%n superfluous lines removed</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="598"/> - <source>Superfluous blank lines removed.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="601"/> - <source>Superfluous blank lines after function decorator removed.</source> + <source>Superfluous blank lines removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="604"/> - <source>Imports were put on separate lines.</source> + <source>Superfluous blank lines after function decorator removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="607"/> - <source>Long lines have been shortened.</source> + <source>Imports were put on separate lines.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="610"/> + <source>Long lines have been shortened.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="613"/> <source>Redundant backslash in brackets removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="616"/> - <source>Compound statement corrected.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="619"/> - <source>Comparison to None/True/False corrected.</source> + <source>Compound statement corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="622"/> - <source>'{0}' argument added.</source> + <source>Comparison to None/True/False corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="625"/> - <source>'{0}' argument removed.</source> + <source>'{0}' argument added.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="628"/> - <source>Whitespace stripped from end of line.</source> + <source>'{0}' argument removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="631"/> - <source>newline added to end of file.</source> + <source>Whitespace stripped from end of line.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="634"/> - <source>Superfluous trailing blank lines removed from end of file.</source> + <source>newline added to end of file.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="637"/> + <source>Superfluous trailing blank lines removed from end of file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="640"/> <source>'<>' replaced by '!='.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="641"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="644"/> <source>Could not save the file! Skipping it. Reason: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="710"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="713"/> <source> no message defined for code '{0}'</source> <translation type="unfinished"></translation> </message> @@ -3840,6 +3841,7 @@ <source>%n issue(s) found</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message numerus="yes"> @@ -3847,6 +3849,7 @@ <source>%n issue(s) fixed</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message numerus="yes"> @@ -3854,6 +3857,7 @@ <source>%n file(s) checked</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message numerus="yes"> @@ -3861,6 +3865,7 @@ <source>%n file(s) with issues found</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message numerus="yes"> @@ -3868,6 +3873,7 @@ <source>%n issue(s) ignored</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> </context> @@ -7274,197 +7280,197 @@ <context> <name>DocStyleChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="260"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="263"/> <source>module is missing a docstring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="262"/> - <source>public function/method is missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="265"/> - <source>private function/method may be missing a docstring</source> + <source>public function/method is missing a docstring</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="268"/> + <source>private function/method may be missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="271"/> <source>public class is missing a docstring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="270"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="273"/> <source>private class may be missing a docstring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="272"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="275"/> <source>docstring not surrounded by """</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="274"/> - <source>docstring containing \ not surrounded by r"""</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="277"/> - <source>docstring containing unicode character not surrounded by u"""</source> + <source>docstring containing \ not surrounded by r"""</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="280"/> + <source>docstring containing unicode character not surrounded by u"""</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="283"/> <source>one-liner docstring on multiple lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="282"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="285"/> <source>docstring has wrong indentation</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="328"/> + <source>docstring summary does not end with a period</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="291"/> + <source>docstring summary is not in imperative mood (Does instead of Do)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="295"/> + <source>docstring summary looks like a function's/method's signature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="298"/> + <source>docstring does not mention the return value type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="301"/> + <source>function/method docstring is separated by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="304"/> + <source>class docstring is not preceded by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="307"/> + <source>class docstring is not followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="362"/> + <source>docstring summary is not followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="313"/> + <source>last paragraph of docstring is not followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="317"/> + <source>private function/method is missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="320"/> + <source>private class is missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="322"/> + <source>leading quotes of docstring not on separate line</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="325"/> - <source>docstring summary does not end with a period</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="288"/> - <source>docstring summary is not in imperative mood (Does instead of Do)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="292"/> - <source>docstring summary looks like a function's/method's signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="295"/> - <source>docstring does not mention the return value type</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="298"/> - <source>function/method docstring is separated by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="301"/> - <source>class docstring is not preceded by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="304"/> - <source>class docstring is not followed by a blank line</source> + <source>trailing quotes of docstring not on separate line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="332"/> + <source>docstring does not contain a @return line but function/method returns something</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="336"/> + <source>docstring contains a @return line but function/method doesn't return anything</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="340"/> + <source>docstring does not contain enough @param/@keyparam lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="343"/> + <source>docstring contains too many @param/@keyparam lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="346"/> + <source>keyword only arguments must be documented with @keyparam lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="349"/> + <source>order of @param/@keyparam lines does not match the function/method signature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="352"/> + <source>class docstring is preceded by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="354"/> + <source>class docstring is followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="356"/> + <source>function/method docstring is preceded by a blank line</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="359"/> - <source>docstring summary is not followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="310"/> - <source>last paragraph of docstring is not followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="314"/> - <source>private function/method is missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="317"/> - <source>private class is missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="319"/> - <source>leading quotes of docstring not on separate line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="322"/> - <source>trailing quotes of docstring not on separate line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="329"/> - <source>docstring does not contain a @return line but function/method returns something</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="333"/> - <source>docstring contains a @return line but function/method doesn't return anything</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="337"/> - <source>docstring does not contain enough @param/@keyparam lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="340"/> - <source>docstring contains too many @param/@keyparam lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="343"/> - <source>keyword only arguments must be documented with @keyparam lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="346"/> - <source>order of @param/@keyparam lines does not match the function/method signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="349"/> - <source>class docstring is preceded by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="351"/> - <source>class docstring is followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="353"/> - <source>function/method docstring is preceded by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="356"/> <source>function/method docstring is followed by a blank line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="362"/> - <source>last paragraph of docstring is followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="365"/> + <source>last paragraph of docstring is followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="368"/> <source>docstring does not contain a @exception line but function/method raises an exception</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="369"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="372"/> <source>docstring contains a @exception line but function/method doesn't raise an exception</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="374"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="377"/> <source>{0}: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="284"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="287"/> <source>docstring does not contain a summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="327"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="330"/> <source>docstring summary does not start with '{0}'</source> <translation type="unfinished"></translation> </message> @@ -7711,6 +7717,7 @@ Do you want to quit anyway?</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message numerus="yes"> @@ -7718,6 +7725,7 @@ <source>%n Download(s)</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message numerus="yes"> @@ -7725,6 +7733,7 @@ <source>Downloading %n file(s)</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> </context> @@ -7735,6 +7744,7 @@ <source>%n:{0:02} minutes remaining</source> <translation type="unfinished"> <numerusform>%n:{0:02} dakika kaldı</numerusform> + <numerusform></numerusform> </translation> </message> <message numerus="yes"> @@ -7742,6 +7752,7 @@ <source>%n seconds remaining</source> <translation type="unfinished"> <numerusform>%n saniye gerekiyor</numerusform> + <numerusform></numerusform> </translation> </message> <message> @@ -9268,127 +9279,127 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2878"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source>Open File</source> <translation>Dosya Aç</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="340"/> + <location filename="../QScintilla/Editor.py" line="343"/> <source><p>The size of the file <b>{0}</b> is <b>{1} KB</b>. Do you really want to load it?</p></source> <translation><p><b>{0}</b>dosyasının boyutu <b>{1} KB</b>. Bu dosyayı yüklemek istiyor musunuz?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="400"/> + <location filename="../QScintilla/Editor.py" line="403"/> <source><b>A Source Editor Window</b><p>This window is used to display and edit a source file. You can open as many of these as you like. The name of the file is displayed in the window's titlebar.</p><p>In order to set breakpoints just click in the space between the line numbers and the fold markers. Via the context menu of the margins they may be edited.</p><p>In order to set bookmarks just Shift click in the space between the line numbers and the fold markers.</p><p>These actions can be reversed via the context menu.</p><p>Ctrl clicking on a syntax error marker shows some info about this error.</p></source> <translation><b>Kaynak Düzenleme Penceresi</b><p>Bu pencere kaynak kod dosyalarını düzenlemek ve göstermek için kullanılır.Bunu pekçok kez kullanmak üzere açabilirsiniz. Dosyanın isim başlıkçubuğunda gösterilir.</p><p>Bekleme noktaların kolayca ekleyip düzenleyebilmeniz için satır numaraları ve işaret alanı vardır..İçerik menüsü aracılığı ile sınırları düzenleyebilirsiniz.</p><p>Bekleme noktalarını ayarlamak için Shift ve ara çubuğuna beraber basabilirsiniz.</p><p>Bu işlem içerik menüsü ilede yapılabilir.</p><p>Bir yazım hatasının üzerinde Ctrl ile tıklarsanız o hata ile ilgili ayrıntılı yardım alırsınız.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="658"/> - <source>Undo</source> - <translation>Geri Al</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="661"/> - <source>Redo</source> - <translation>İleri al</translation> + <source>Undo</source> + <translation>Geri Al</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="664"/> + <source>Redo</source> + <translation>İleri al</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="667"/> <source>Revert to last saved state</source> <translation>En son kaydedileni eski haline getir</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="668"/> - <source>Cut</source> - <translation>Kes</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="671"/> - <source>Copy</source> - <translation>Kopyala</translation> + <source>Cut</source> + <translation>Kes</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="674"/> + <source>Copy</source> + <translation>Kopyala</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="677"/> <source>Paste</source> <translation>Yapıştır</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="679"/> - <source>Indent</source> - <translation>Girinti</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="682"/> - <source>Unindent</source> - <translation>Girintisiz</translation> + <source>Indent</source> + <translation>Girinti</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="685"/> - <source>Comment</source> - <translation>Yorumlayıcı</translation> + <source>Unindent</source> + <translation>Girintisiz</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="688"/> - <source>Uncomment</source> - <translation>Yorumlanamaz</translation> + <source>Comment</source> + <translation>Yorumlayıcı</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="691"/> - <source>Stream Comment</source> - <translation>Yorumlayıcı</translation> + <source>Uncomment</source> + <translation>Yorumlanamaz</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="694"/> + <source>Stream Comment</source> + <translation>Yorumlayıcı</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="697"/> <source>Box Comment</source> <translation>Kutu Yorumlayıcı</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="698"/> - <source>Select to brace</source> - <translation>Köşeli ayracı seç</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="700"/> - <source>Select all</source> - <translation>Hepsini seç</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="701"/> + <source>Select to brace</source> + <translation>Köşeli ayracı seç</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="703"/> + <source>Select all</source> + <translation>Hepsini seç</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="704"/> <source>Deselect all</source> <translation>Tüm seçimi iptal et</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7242"/> + <location filename="../QScintilla/Editor.py" line="7249"/> <source>Check spelling...</source> <translation>Yazım Kontrolü...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="707"/> + <location filename="../QScintilla/Editor.py" line="710"/> <source>Check spelling of selection...</source> <translation>Seçilen alanın yazım kontrolü...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="711"/> + <location filename="../QScintilla/Editor.py" line="714"/> <source>Remove from dictionary</source> <translation>Sözlükten çıkar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="715"/> + <location filename="../QScintilla/Editor.py" line="718"/> <source>Shorten empty lines</source> <translation>Boş satırları kısalt</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="722"/> + <location filename="../QScintilla/Editor.py" line="725"/> <source>Use Monospaced Font</source> <translation>Tek hacimli yazıtipi kullan</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="727"/> + <location filename="../QScintilla/Editor.py" line="730"/> <source>Autosave enabled</source> <translation>Otomatik kayıt kabul edildi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="731"/> + <location filename="../QScintilla/Editor.py" line="734"/> <source>Typing aids enabled</source> <translation>Yazım yardımı etkinleştirildi</translation> </message> @@ -9398,27 +9409,27 @@ <translation type="obsolete">Otomatik tamamlama onaylı</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="768"/> + <location filename="../QScintilla/Editor.py" line="771"/> <source>Close</source> <translation>Kapat</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="774"/> - <source>Save</source> - <translation>Kaydet</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="777"/> + <source>Save</source> + <translation>Kaydet</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="780"/> <source>Save As...</source> <translation>Farklı Kaydet...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="790"/> - <source>Print Preview</source> - <translation>Baskı Öngörünümü</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="793"/> + <source>Print Preview</source> + <translation>Baskı Öngörünümü</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="796"/> <source>Print</source> <translation>Yazdır</translation> </message> @@ -9433,742 +9444,742 @@ <translation type="obsolete">dinamik</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="819"/> + <location filename="../QScintilla/Editor.py" line="822"/> <source>Complete from Document</source> <translation type="unfinished">Belgeden</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="821"/> + <location filename="../QScintilla/Editor.py" line="824"/> <source>Complete from APIs</source> <translation type="unfinished">API'den</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="823"/> + <location filename="../QScintilla/Editor.py" line="826"/> <source>Complete from Document and APIs</source> <translation type="unfinished">Belgeden ve API'den</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="746"/> + <location filename="../QScintilla/Editor.py" line="749"/> <source>Calltip</source> <translation>İpucu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="837"/> + <location filename="../QScintilla/Editor.py" line="840"/> <source>Check</source> <translation>Kontrol</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="857"/> - <source>Show</source> - <translation>Göster</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="859"/> - <source>Code metrics...</source> - <translation>Metrik Kod...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="860"/> - <source>Code coverage...</source> - <translation>Kod koruyucu...</translation> + <source>Show</source> + <translation>Göster</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="862"/> - <source>Show code coverage annotations</source> - <translation>Kodun dipnotunu göster</translation> + <source>Code metrics...</source> + <translation>Metrik Kod...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="863"/> + <source>Code coverage...</source> + <translation>Kod koruyucu...</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="865"/> - <source>Hide code coverage annotations</source> - <translation>Kod koruyucu dipnotunu gizle</translation> + <source>Show code coverage annotations</source> + <translation>Kodun dipnotunu göster</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="868"/> + <source>Hide code coverage annotations</source> + <translation>Kod koruyucu dipnotunu gizle</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="871"/> <source>Profile data...</source> <translation>Veri kesiti...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="881"/> + <location filename="../QScintilla/Editor.py" line="884"/> <source>Diagrams</source> <translation>Şema</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="883"/> + <location filename="../QScintilla/Editor.py" line="886"/> <source>Class Diagram...</source> <translation>Sınıf Şeması...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="885"/> + <location filename="../QScintilla/Editor.py" line="888"/> <source>Package Diagram...</source> <translation>Paket Şeması...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="887"/> + <location filename="../QScintilla/Editor.py" line="890"/> <source>Imports Diagram...</source> <translation>Şemayı İçe aktar...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="889"/> + <location filename="../QScintilla/Editor.py" line="892"/> <source>Application Diagram...</source> <translation>Uygulama Şeması...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="907"/> - <source>Languages</source> - <translation>Diller</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="910"/> + <source>Languages</source> + <translation>Diller</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="913"/> <source>No Language</source> <translation>Dil Yok</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="933"/> + <location filename="../QScintilla/Editor.py" line="936"/> <source>Guessed</source> <translation>Tahmin edilen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1268"/> + <location filename="../QScintilla/Editor.py" line="1271"/> <source>Alternatives</source> <translation>Alternatifler</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="953"/> + <location filename="../QScintilla/Editor.py" line="956"/> <source>Encodings</source> <translation>Kodlama</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="994"/> + <location filename="../QScintilla/Editor.py" line="997"/> <source>End-of-Line Type</source> <translation>Yazım satırının sonu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="998"/> + <location filename="../QScintilla/Editor.py" line="1001"/> <source>Unix</source> <translation>Unix</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1005"/> + <location filename="../QScintilla/Editor.py" line="1008"/> <source>Windows</source> <translation>Windows</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1012"/> + <location filename="../QScintilla/Editor.py" line="1015"/> <source>Macintosh</source> <translation>Macintosh</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1030"/> + <location filename="../QScintilla/Editor.py" line="1033"/> <source>Export as</source> <translation>Farklı Dışaktar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1153"/> + <location filename="../QScintilla/Editor.py" line="1156"/> <source>Toggle bookmark</source> <translation>Yerimi açkapa</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1155"/> + <location filename="../QScintilla/Editor.py" line="1158"/> <source>Next bookmark</source> <translation>Sonraki yerimi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1157"/> + <location filename="../QScintilla/Editor.py" line="1160"/> <source>Previous bookmark</source> <translation>Önceki yerimi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1159"/> + <location filename="../QScintilla/Editor.py" line="1162"/> <source>Clear all bookmarks</source> <translation>Tüm yerimlerini temizle</translation> </message> <message> + <location filename="../QScintilla/Editor.py" line="1182"/> + <source>Toggle breakpoint</source> + <translation>Beklemenoktası açkapa</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1184"/> + <source>Toggle temporary breakpoint</source> + <translation>Geçici bekleme noktası açkapa</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1187"/> + <source>Edit breakpoint...</source> + <translation>Bekleme noktasını düzenle...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5161"/> + <source>Enable breakpoint</source> + <translation>Beklemenoktasını etkinleştir</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1192"/> + <source>Next breakpoint</source> + <translation>Sonraki Beklemenoktası</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1194"/> + <source>Previous breakpoint</source> + <translation>Önceki bekleme noktası</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1196"/> + <source>Clear all breakpoints</source> + <translation>Tüm beklemenoktalarını temizle</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1165"/> + <source>Goto syntax error</source> + <translation>Sözdizimi hatasına git</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1167"/> + <source>Show syntax error message</source> + <translation>Sözdizimi hata mesajını göster</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1169"/> + <source>Clear syntax error</source> + <translation>Sözdizimi hatalarını sil</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1172"/> + <source>Next warning</source> + <translation>Sonraki Uyarı</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1175"/> + <source>Previous warning</source> + <translation>Önceki Uyarı</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1177"/> + <source>Show warning message</source> + <translation>Uyarı mesajını göster</translation> + </message> + <message> <location filename="../QScintilla/Editor.py" line="1179"/> - <source>Toggle breakpoint</source> - <translation>Beklemenoktası açkapa</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1181"/> - <source>Toggle temporary breakpoint</source> - <translation>Geçici bekleme noktası açkapa</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1184"/> - <source>Edit breakpoint...</source> - <translation>Bekleme noktasını düzenle...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="5154"/> - <source>Enable breakpoint</source> - <translation>Beklemenoktasını etkinleştir</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1189"/> - <source>Next breakpoint</source> - <translation>Sonraki Beklemenoktası</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1191"/> - <source>Previous breakpoint</source> - <translation>Önceki bekleme noktası</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1193"/> - <source>Clear all breakpoints</source> - <translation>Tüm beklemenoktalarını temizle</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1162"/> - <source>Goto syntax error</source> - <translation>Sözdizimi hatasına git</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1164"/> - <source>Show syntax error message</source> - <translation>Sözdizimi hata mesajını göster</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1166"/> - <source>Clear syntax error</source> - <translation>Sözdizimi hatalarını sil</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1169"/> - <source>Next warning</source> - <translation>Sonraki Uyarı</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1172"/> - <source>Previous warning</source> - <translation>Önceki Uyarı</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1174"/> - <source>Show warning message</source> - <translation>Uyarı mesajını göster</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1176"/> <source>Clear warnings</source> <translation>Uyarıları temizle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1196"/> - <source>Next uncovered line</source> - <translation>Sonraki kapanmamış satır</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1199"/> - <source>Previous uncovered line</source> - <translation>Önceki kaplanmamış satır</translation> + <source>Next uncovered line</source> + <translation>Sonraki kapanmamış satır</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="1202"/> + <source>Previous uncovered line</source> + <translation>Önceki kaplanmamış satır</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1205"/> <source>Next task</source> <translation>Sonraki görev</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1204"/> + <location filename="../QScintilla/Editor.py" line="1207"/> <source>Previous task</source> <translation>Önceki görev</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1213"/> + <location filename="../QScintilla/Editor.py" line="1216"/> <source>LMB toggles bookmarks</source> <translation>LMB açkapa yerimleri</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1217"/> + <location filename="../QScintilla/Editor.py" line="1220"/> <source>LMB toggles breakpoints</source> <translation>LMB açkapa bekleme noktası</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1253"/> + <location filename="../QScintilla/Editor.py" line="1256"/> <source>Export source</source> <translation>Kaynağı dışaktar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1245"/> + <location filename="../QScintilla/Editor.py" line="1248"/> <source><p>No exporter available for the export format <b>{0}</b>. Aborting...</p></source> <translation><p>dışa katarma tipi <b>{0}</b>için dışaaktarıcı yok. Vazgeçiliyior...</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1253"/> + <location filename="../QScintilla/Editor.py" line="1256"/> <source>No export format given. Aborting...</source> <translation>Girilen dışaaktarma formatı yok. İptal edildi...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1264"/> + <location filename="../QScintilla/Editor.py" line="1267"/> <source>Alternatives ({0})</source> <translation>Alternatifler ({0})</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1284"/> + <location filename="../QScintilla/Editor.py" line="1287"/> <source>Pygments Lexer</source> <translation>Pygments Lexer</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1284"/> + <location filename="../QScintilla/Editor.py" line="1287"/> <source>Select the Pygments lexer to apply.</source> <translation>Kullanmak için Pygment lexer seç.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1752"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>Modification of Read Only file</source> <translation>Yalnızca okunabilir dosyada değişiklik</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1752"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Yalnızca okunabilir bir dosyayı değiştirmeşe çalışıyorsunuz. Lütfen önce farklı bir isimde kaydediniz.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2443"/> + <location filename="../QScintilla/Editor.py" line="2448"/> <source>Printing...</source> <translation>Yazılıyor...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2460"/> - <source>Printing completed</source> - <translation>Yazdırma tamalandı</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2462"/> - <source>Error while printing</source> - <translation>Yazdırılırken hata</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2465"/> + <source>Printing completed</source> + <translation>Yazdırma tamalandı</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2467"/> + <source>Error while printing</source> + <translation>Yazdırılırken hata</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2470"/> <source>Printing aborted</source> <translation>Yazdırma iptal edildi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2823"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source>File Modified</source> <translation>Dosya Değiştirildi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2823"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p><b>{0}</b>dosyasında kaydedilmemiş değişiklikler var.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2878"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>Dosya <b>{0}</b> açılamıyor.</p><p>Sebep: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3041"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source>Save File</source> <translation>Dosyayı Kaydet</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2982"/> + <location filename="../QScintilla/Editor.py" line="2987"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>Dosya <b>{0}</b> kaydedilemiyor.</p><p>Sebep: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4427"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion</source> <translation>Otomatik tamamlama</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4427"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Otomatiktamamlama uygun değil çünkü bu otomatiktamamlama kaynağı değil.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5157"/> + <location filename="../QScintilla/Editor.py" line="5164"/> <source>Disable breakpoint</source> <translation>Durmanoktasını iptal et</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5531"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Code Coverage</source> <translation>Kod Koruyucu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5531"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Please select a coverage file</source> <translation>Lütfen bir koruyucu dosya seçiniz</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5594"/> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>Show Code Coverage Annotations</source> <translation>Kodların Dipnotunu Göster</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5587"/> - <source>All lines have been covered.</source> - <translation>Tüm satırlar korumaya alındı.</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="5594"/> + <source>All lines have been covered.</source> + <translation>Tüm satırlar korumaya alındı.</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>There is no coverage file available.</source> <translation>Hazırda koruma dosyası yok.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5709"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Profile Data</source> <translation>Veri Kesiti</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5709"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Please select a profile file</source> <translation>Lütfen kesit dosyasını seçiniz</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5869"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>Syntax Error</source> <translation>Sözdizimi Hatası</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5869"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>No syntax error message available.</source> <translation>Uygun söz dizimi hata mesajı yok.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6184"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Macro Name</source> <translation>Makro Adı</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6184"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Select a macro name:</source> <translation>Bir makro ismi seç:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6212"/> + <location filename="../QScintilla/Editor.py" line="6219"/> <source>Load macro file</source> <translation>Makro dosyasını yükle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6255"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Macro files (*.macro)</source> <translation>Makro dosyaları (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6235"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source>Error loading macro</source> <translation>Makronun yüklenmesinde hata</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6226"/> + <location filename="../QScintilla/Editor.py" line="6233"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Makro dosyası <b>{0}</b> okunamıyor.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6235"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Makro dosyası <b>{0}</b> bozuk.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6255"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Save macro file</source> <translation>Makro Dosyasını Kaydet</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6272"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source>Save macro</source> <translation>Makro Kaydet</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6288"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source>Error saving macro</source> <translation>Makronun kaydedilmesinde hata</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6288"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>Makro dosyası <b>{0}</b> yazılamıyor.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6301"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Start Macro Recording</source> <translation>Makro Kaydı Başladı</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6301"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Macro recording is already active. Start new?</source> <translation>Makro kaydı şuan aktif. Yeniden başlasın mı?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6327"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Macro Recording</source> <translation>Makro Kaydediliyor</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6327"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Enter name of the macro:</source> <translation>Makronun ismini gir:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6465"/> + <location filename="../QScintilla/Editor.py" line="6472"/> <source>File changed</source> <translation>Dosya değiştirilmiş</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6629"/> + <location filename="../QScintilla/Editor.py" line="6636"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6769"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source>Drop Error</source> <translation>Düşme hatası</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6769"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> bir dosya değil.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6790"/> + <location filename="../QScintilla/Editor.py" line="6797"/> <source>Resources</source> <translation>Kaynaklar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6792"/> - <source>Add file...</source> - <translation>Dosya ekle...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6794"/> - <source>Add files...</source> - <translation>Dosyaları ekle...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6796"/> - <source>Add aliased file...</source> - <translation>Kısaltmalar dosyasına ekle...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6799"/> - <source>Add localized resource...</source> - <translation>Yaral kaynak ekle...</translation> + <source>Add file...</source> + <translation>Dosya ekle...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6801"/> + <source>Add files...</source> + <translation>Dosyaları ekle...</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="6803"/> + <source>Add aliased file...</source> + <translation>Kısaltmalar dosyasına ekle...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6806"/> + <source>Add localized resource...</source> + <translation>Yaral kaynak ekle...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6810"/> <source>Add resource frame</source> <translation>Çerçeve kaynağı ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6822"/> + <location filename="../QScintilla/Editor.py" line="6829"/> <source>Add file resource</source> <translation>Dosya kaynağını ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6838"/> + <location filename="../QScintilla/Editor.py" line="6845"/> <source>Add file resources</source> <translation>Dosya kaynaklarını ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6866"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Add aliased file resource</source> <translation>Kısaltmalar dosyası kaynağını ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6866"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Alias for file <b>{0}</b>:</source> <translation><b>{0} dosyası için takma ad</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6930"/> + <location filename="../QScintilla/Editor.py" line="6937"/> <source>Package Diagram</source> <translation>Paket Şeması</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6930"/> + <location filename="../QScintilla/Editor.py" line="6937"/> <source>Include class attributes?</source> <translation>Sınıf nitelikleri dahil edilsin mi?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6950"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Imports Diagram</source> <translation>Şemayı İçe Aktar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6950"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Include imports from external modules?</source> <translation>Harici modüllerdan içe aktarım dahil edilsin mi?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6964"/> + <location filename="../QScintilla/Editor.py" line="6971"/> <source>Application Diagram</source> <translation>Uygulama Şeması</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6964"/> + <location filename="../QScintilla/Editor.py" line="6971"/> <source>Include module names?</source> <translation>Modül isimleri dahil edilsin mi?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7245"/> + <location filename="../QScintilla/Editor.py" line="7252"/> <source>Add to dictionary</source> <translation>Sözlüğe ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7247"/> + <location filename="../QScintilla/Editor.py" line="7254"/> <source>Ignore All</source> <translation>Hepsini Yoksay</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3041"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p><b>{0}</b> dosyası halen mevcut. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6123"/> - <source>Warning: {0}</source> - <translation>Dikkat: {0}</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6130"/> + <source>Warning: {0}</source> + <translation>Dikkat: {0}</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6137"/> <source>Error: {0}</source> <translation>Hata: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6272"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Makro dosyası <b>{0}</b> zaten var. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6461"/> + <location filename="../QScintilla/Editor.py" line="6468"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4532"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Activating Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4532"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4852"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Activating Calltip Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4852"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="786"/> + <location filename="../QScintilla/Editor.py" line="789"/> <source>Open 'rejection' file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="893"/> + <location filename="../QScintilla/Editor.py" line="896"/> <source>Load Diagram...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1207"/> - <source>Next change</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1210"/> + <source>Next change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1213"/> <source>Previous change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7659"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7659"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6059"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>Warning</source> <translation type="unfinished">Dikkat</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6059"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6120"/> + <location filename="../QScintilla/Editor.py" line="6127"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="760"/> - <source>New Document View</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="763"/> + <source>New Document View</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="766"/> <source>New Document View (with new split)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="847"/> + <location filename="../QScintilla/Editor.py" line="850"/> <source>Tools</source> <translation type="unfinished">Araçlar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="975"/> + <location filename="../QScintilla/Editor.py" line="978"/> <source>Re-Open With Encoding</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6455"/> + <location filename="../QScintilla/Editor.py" line="6462"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"><p>Eric5 ile açıldıktan sonra <b>{0}</b> dosyasında değişiklik olmuş. Yeniden açılsın mı?</p> {0}?} {6.?}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="738"/> + <location filename="../QScintilla/Editor.py" line="741"/> <source>Automatic Completion enabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="816"/> + <location filename="../QScintilla/Editor.py" line="819"/> <source>Complete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4581"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4581"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7746"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7746"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="780"/> + <location filename="../QScintilla/Editor.py" line="783"/> <source>Save Copy...</source> <translation type="unfinished"></translation> </message> @@ -10246,7 +10257,7 @@ <translation>Kurulan API dosyalarının listesinden bir API dosyası seçmek için basınız</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> <source>Add from installed APIs</source> <translation>Kurulan API'lerden ekle</translation> </message> @@ -10256,7 +10267,7 @@ <translation>Kurulen eklentilerin API dosya listesinden bir API dosyası seçmek için basınız</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> <source>Add from Plugin APIs</source> <translation>Eklenti API'lerinden ekle</translation> </message> @@ -10266,7 +10277,7 @@ <translation>Seçilen API'lerin tanımlarının derlenmesi için basınız</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="299"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="301"/> <source>Compile APIs</source> <translation>API'leri Derle</translation> </message> @@ -10281,22 +10292,22 @@ <translation>API Dosyası (*.api);;Tüm Dosyalar (*)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="238"/> <source>Select from the list of installed API files</source> <translation>Kurulan API dosyalırının listesinden seçiniz</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> <source>Select from the list of API files installed by plugins</source> <translation>Kurulan eklentilerin API dosyalırının listesinden seçiniz</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="314"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="316"/> <source>Cancel compilation</source> <translation>Derlemeden Vazgeç</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> <source>There are no APIs installed yet. Selection is not available.</source> <translation type="unfinished"></translation> </message> @@ -10468,6 +10479,89 @@ </message> </context> <context> + <name>EditorButtonsWidget</name> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="175"/> + <source>Bold</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="177"/> + <source>Italic</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="179"/> + <source>Strike Through</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="182"/> + <source>Header 1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="184"/> + <source>Header 2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="186"/> + <source>Header 3</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="188"/> + <source>Header</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="193"/> + <source>Inline Code</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="195"/> + <source>Code Block</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="197"/> + <source>Quote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="200"/> + <source>Add Hyperlink</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="202"/> + <source>Add Horizontal Line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="204"/> + <source>Add Image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="207"/> + <source>Add Bulleted List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="209"/> + <source>Add Numbered List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="273"/> + <source>Level {0}</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>EditorCalltipsPage</name> <message> <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="17"/> @@ -11277,7 +11371,7 @@ <translation>İlişkilendirilecek alternatif Lexeri seç</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightersPage.py" line="142"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightersPage.py" line="146"/> <source>Alternative</source> <translation>Alternatif</translation> </message> @@ -11340,7 +11434,7 @@ <translation>Satır sonuna kadar dolrurmak için seç.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> <source>Fill to end of line</source> <translation>Satırın sonuna kadar doldur</translation> </message> @@ -11450,42 +11544,42 @@ <translation>Yalnızca boyut</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="351"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="355"/> <source>Enabled</source> <translation>Etkinleştirilmiş</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="352"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="356"/> <source>Disabled</source> <translation>Onaylanmamış</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> <source>Select fill to end of line for all styles</source> <translation>Tüm stiller için satır sonunu doldurmayı seç</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465"/> <source>Export Highlighting Styles</source> <translation>Vurgulama stillerini dışa aktar</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="477"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="481"/> <source>Highlighting styles file (*.e4h)</source> <translation>Metin vurgulayıcı stil dosyaları (*.e4h)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465"/> <source><p>The highlighting styles could not be exported to file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Metin vurgulayacı stili <b>{0}</b> dosyasına dış aktarılamıyor.</p><p>Sebep: {1}</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="497"/> <source>Import Highlighting Styles</source> <translation>Vurgulama stillerini içe aktar</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="497"/> <source><p>The highlighting styles could not be read from file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Metin vurgulayacı stili <b>{0}</b> dosyasından okunamıyor.</p><p>Sebep: {1}</p></translation> </message> @@ -11597,12 +11691,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1048"/> <source>Select whether folding of comments shall be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1051"/> <source>Fold comments</source> <translation>Katlanmış yorumlama</translation> </message> @@ -11612,22 +11706,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="990"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/> <source>Select whether folding at else statement should be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/> <source>Fold at else</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="522"/> <source>Select whether folding of preprocessor directives shall be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="525"/> <source>Fold preprocessor directives</source> <translation type="unfinished"></translation> </message> @@ -11737,187 +11831,187 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/> <source>Pascal Lexer Properties</source> <translation>Paskal Dil Özellikleri</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="503"/> - <source>Select to enable smart highlighting of keywords</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/> - <source>Smart Highlighting</source> - <translation>Akıllı vurgulama</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="516"/> - <source>Perl Lexer Properties</source> - <translation>Perl Dil Özellikleri</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/> - <source>Select to enable folding of Perl packages</source> + <source>Select to enable smart highlighting of keywords</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="535"/> - <source>Fold packages</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="542"/> - <source>Select to enable folding of Perl POD blocks</source> - <translation type="unfinished"></translation> + <source>Smart Highlighting</source> + <translation>Akıllı vurgulama</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/> + <source>Perl Lexer Properties</source> + <translation>Perl Dil Özellikleri</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="561"/> + <source>Select to enable folding of Perl packages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="564"/> + <source>Fold packages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="571"/> + <source>Select to enable folding of Perl POD blocks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="574"/> <source>Fold POD blocks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="565"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="594"/> <source>PostScript Lexer Properties</source> <translation>PostScript Dil Özellikleri</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="581"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="610"/> <source>Select to mark tokens</source> <translation>Belirteçleri seçiniz</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="584"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="613"/> <source>Mark Tokens</source> <translation>Belirteçler</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="593"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="622"/> <source>PostScript Level:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="600"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="629"/> <source>Select the PostScript level</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="637"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/> <source>Povray Lexer Properties</source> <translation>Povray Dil Özellikleri</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="643"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/> <source>Select whether folding of directives shall be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="646"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/> <source>Fold directives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="685"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> <source>Python Lexer Properties</source> <translation>Python Dil Özillikleri</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="796"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="825"/> <source>Select whether bad indentation shall be highlighted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="730"/> <source>Select whether folding of strings shall be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="733"/> <source>Fold strings</source> <translation>Katlanmış metin</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="721"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="750"/> <source>Select whether text should be autoindented after a ':'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="724"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="753"/> <source>Auto indentation after ':'</source> <translation>':' den sonra Otomatik Girintileme</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="741"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="770"/> <source>Select to allow Python v2 unicode string literals (e.g. u"utf8")</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="744"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="773"/> <source>Allow v2 unicode string literals</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="751"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="780"/> <source>Select to allow Python v3 binary and octal literals (e.g. 0b1011, 0o712)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="754"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/> <source>Allow v3 binary and octal literals</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="761"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="790"/> <source>Select to allow Python v3 bytes string literals (e.g. b"bytes")</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="764"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="793"/> <source>Allow v3 bytes string literals</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="827"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/> <source>SQL Lexer Properties</source> <translation>SQL Dili Özellikleri</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="863"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="892"/> <source>Select to enable Backslash Escapes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="866"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="895"/> <source>Backslash Escapes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="964"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/> <source>VHDL Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="999"/> <source>Select whether folding of blocks at a parenthesis shall be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1002"/> <source>Fold at parenthesis</source> <translation>Parentezleri katla</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1009"/> <source>Select whether folding of begin blocks shall be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1012"/> <source>Fold at begin</source> <translation>Başlangıçta katlı</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1013"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1042"/> <source>YAML Lexer Properties</source> <translation>YAML Lexer Özellikleri</translation> </message> @@ -11952,112 +12046,112 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="695"/> <source>Properties Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/> <source>Select to allow initial spaces in a line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/> <source>Allow initial spaces</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="740"/> <source>Select whether folding of triple quoted strings shall be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="743"/> <source>Fold triple quoted strings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="760"/> <source>Select to allow strings to span newline characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="734"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="763"/> <source>Strings may span newline characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="808"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="837"/> <source>Ruby Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="853"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="882"/> <source>Select whether only BEGIN blocks can be folded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="885"/> <source>Only BEGIN blocks can be folded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="873"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="902"/> <source>Select if words may contain dots</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="876"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="905"/> <source>Words may contain dots</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="883"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="912"/> <source>Select to allow '#' as a comment character</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="886"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="915"/> <source>Allow '#' as comment character</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="893"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="922"/> <source>Select to enable quoted identifiers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="896"/> - <source>Enable quoted identifiers</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="906"/> - <source>TCL Lexer Properties</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="925"/> - <source>TeX Lexer Properties</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="941"/> - <source>Select to treat comments as TeX source</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="944"/> - <source>Treat comments as TeX source</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="951"/> - <source>Select to treat \if<unknown> as a command</source> + <source>Enable quoted identifiers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="935"/> + <source>TCL Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="954"/> + <source>TeX Lexer Properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/> + <source>Select to treat comments as TeX source</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/> + <source>Treat comments as TeX source</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/> + <source>Select to treat \if<unknown> as a command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/> <source>Treat \if<unknown> as command</source> <translation type="unfinished"></translation> </message> @@ -12067,7 +12161,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="774"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="803"/> <source>Highlight sub-identifiers</source> <translation type="unfinished"></translation> </message> @@ -12077,7 +12171,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="771"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="800"/> <source>Select to highlight sub-identifiers defined in keyword set 2</source> <translation type="unfinished"></translation> </message> @@ -12132,32 +12226,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="812"/> <source>Highlight bad indentation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>No Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Inconsistent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Tabs after Spaces</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Spaces</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Tabs</source> <translation type="unfinished">Sekmeler</translation> </message> @@ -12177,7 +12271,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="194"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/> <source>Highlight escape sequences</source> <translation type="unfinished"></translation> </message> @@ -12191,6 +12285,26 @@ <source>Allow verbatim string escape sequences</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/> + <source>JSON</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="483"/> + <source>Select to enable highlighting of line/block comments</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="486"/> + <source>Highlight comments</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/> + <source>Select to enable highlighting of escape sequences in strings</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSearchPage</name> @@ -13305,6 +13419,16 @@ <source>Select the colour for the search marker</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1866"/> + <source>Select to hide the Format Buttons bar when formatting is not supported</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1869"/> + <source>Hide Format Buttons bar when not supported</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSyntaxPage</name> @@ -13570,7 +13694,7 @@ <context> <name>EmailDialog</name> <message> - <location filename="../UI/EmailDialog.py" line="339"/> + <location filename="../UI/EmailDialog.py" line="346"/> <source>Send bug report</source> <translation>Hata raporu gönder</translation> </message> @@ -13665,27 +13789,27 @@ <translation>Diyaloğu kapatmak istediğinizden emin misiniz?</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="293"/> + <location filename="../UI/EmailDialog.py" line="300"/> <source>Mail Server Password</source> <translation>Posta Sunucu Parolası</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="293"/> + <location filename="../UI/EmailDialog.py" line="300"/> <source>Enter your mail server password</source> <translation>Posta sunucu parolanızı giriniz</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="311"/> + <location filename="../UI/EmailDialog.py" line="318"/> <source><p>Authentication failed.<br>Reason: {0}</p></source> <translation><p>Doğrulama hatası.<br>Sebip: {0}</p></translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="339"/> + <location filename="../UI/EmailDialog.py" line="346"/> <source><p>Message could not be sent.<br>Reason: {0}</p></source> <translation><p>Mesaj gönderilemedi.<br>Sebep: {0}</p></translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="357"/> + <location filename="../UI/EmailDialog.py" line="364"/> <source>Attach file</source> <translation>Dosya ekle</translation> </message> @@ -13710,98 +13834,133 @@ <message> <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/> <source>Outgoing mail server port:</source> - <translation>Giden eposta suncu bağlantı noktası:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="60"/> + <translation type="obsolete">Giden eposta suncu bağlantı noktası:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="124"/> <source>Enter the port of the mail server</source> <translation>Posta sunucusunun portunu fgir</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="92"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/> <source>Email address:</source> <translation>E-posta adresi:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="99"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/> <source>Enter your email address</source> <translation>Emektup adresini giriniz</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="106"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="170"/> <source>Signature:</source> <translation>İmza:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="116"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="180"/> <source>Enter your email signature</source> <translation>Posta imzanızı giriniz</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="128"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="104"/> <source>Select to use TLS</source> <translation>TLS kullanmak için seç</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="131"/> <source>Use TLS</source> - <translation>TLS kullan</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="138"/> + <translation type="obsolete">TLS kullan</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="192"/> <source>Select to authenticatate against the mail server</source> <translation>Posta sunucusunda yetki kaydı için siçiniz</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="141"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="195"/> <source>Mail server needs authentication</source> <translation>Posta sunucusu yetki kaydı istiyor</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="153"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="204"/> <source>Username:</source> <translation>Kullanıcı Adı:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="211"/> <source>Enter your mail server username</source> <translation>Posta sunucusu kullanıcı adınızı giriniz</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="173"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="218"/> <source>Password:</source> <translation>Parola:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="183"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="225"/> <source>Enter your password for accessing the mail server</source> <translation>Posta sunucusunu açmak için parolanızı giriniz</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="193"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="235"/> <source>Press to test the login data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="196"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="238"/> <source>Test Login</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/> <source>Login Test</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="138"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="204"/> <source>The login test succeeded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/> <source><p>The login test failed.<br>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/> + <source>Encryption Method:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="81"/> + <source>Select to use no encryption</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="84"/> + <source>None</source> + <translation type="unfinished">Yok</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="94"/> + <source>Select to use SSL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="97"/> + <source>SSL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="107"/> + <source>TLS</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="117"/> + <source>Port:</source> + <translation type="unfinished">Bağlantı Noktası:</translation> + </message> </context> <context> <name>EricAccessHandler</name> @@ -14750,12 +14909,12 @@ <context> <name>ExceptionsFilterDialog</name> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="13"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="14"/> <source>Exceptions Filter</source> <translation>İstisnai Süzgeç</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="16"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="17"/> <source><b>Exception Filter</b> <p>This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the "Start Debugging" dialog is unchecked, no exception will be reported at all.</p> <p>Please note, that unhandled exceptions are always highlighted independent of these settings.</p></source> @@ -14764,42 +14923,42 @@ <p>Lütfen not ediniz, yürütülmeyen istisnalar burdaki ayarlardan bağımsız olarak işaretlenmiştir.</p></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="27"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="28"/> <source>List of exceptions that shall be highlighted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="42"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="41"/> <source>Press to add the entered exception to the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="45"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="44"/> <source>Add</source> <translation>Ekle</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="52"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="51"/> <source>Enter an exception type that shall be highlighted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="66"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="61"/> <source>Press to delete the selected exception from the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="69"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="64"/> <source>Delete</source> <translation>Sil</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="76"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="71"/> <source>Press to delete all exceptions from the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="79"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="74"/> <source>Delete All</source> <translation>Hepsini Sil</translation> </message> @@ -15966,6 +16125,7 @@ <source>%n occurrence(s)</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message numerus="yes"> @@ -15973,6 +16133,7 @@ <source>%n file(s)</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> </context> @@ -16966,8 +17127,8 @@ </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1218"/> - <source>Open Link in New Tab Ctrl+LMB</source> - <translation>Yeni sekmede bir bağlantı açar Ctrl+LMB</translation> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Yeni sekmede bir bağlantı açar<byte value="x9"/>Ctrl+LMB</translation> </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1223"/> @@ -17927,6 +18088,7 @@ You have %n tab(s) open.</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message> @@ -21716,6 +21878,7 @@ <source>Inserting %n byte(s)</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message numerus="yes"> @@ -21723,6 +21886,7 @@ <source>Deleting %n byte(s)</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> </context> @@ -21892,7 +22056,7 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1822"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -21942,147 +22106,147 @@ <translation>Yenşden adlandırılıyor {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012"/> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1057"/> <source>Merging</source> <translation>Birleştiriliyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1359"/> <source>Mercurial command</source> <translation>Mercurial komut</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/> <source>Pulling from a remote Mercurial repository</source> <translation>Uzak Mercurial kaynak havuzundan çekiliyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2022"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2427"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2451"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2475"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p><b>{0}</b> dosyası halihazırda bulunuyor. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2604"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Değiştirme grubu Dosyaları (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2625"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2710"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Değişimgrubu Dosyaları (*.hg);;Tüm Dosyalar (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2730"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2727"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2759"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2623"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2578"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -22092,72 +22256,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2959"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -22172,157 +22336,157 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Revert changes</source> <translation type="unfinished">Değişiklikleri başa döndür</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1030"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="997"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Dosya <b>{0}</b> okunamıyor.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1133"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3614"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3924"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -24664,7 +24828,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>Mercurial Log</source> <translation>Mercurial Günlüğü</translation> </message> @@ -24694,17 +24858,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/> <source>Revision</source> <translation>Gözden Geçirme</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> <source>Author</source> <translation>Yazar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="103"/> <source>Message</source> <translation>Mesaj</translation> </message> @@ -24729,162 +24893,162 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="285"/> <source>Action</source> <translation>İşlem</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="290"/> <source>Path</source> <translation>Yol</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="295"/> <source>Copy from</source> <translation>den Kopyala</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="306"/> <source>Press to get the next bunch of log entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="309"/> <source>&Next</source> <translation>So&nraki</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="316"/> <source>Enter the limit of entries to fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="335"/> <source>Select to stop listing log messages at a copy or move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="338"/> <source>Stop on Copy/Move</source> <translation>Kopyalama/Taşımıyı Durdur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="378"/> <source>Press to generate a diff to the first parent revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="381"/> <source>Diff to Parent &1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> <source>Press to generate a diff to the second parent revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="391"/> <source>Diff to Parent &2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="398"/> <source>Press to compare two revisions</source> <translation>İki düzenlemeyi karşılaştırmak için basınız</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="401"/> <source>&Compare Revisions</source> <translation>Gözden Geçirmeleri Karşılaş&tır</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="462"/> <source>Errors</source> <translation>Hatalar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="468"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="484"/> <source>Input</source> <translation>Girdi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="474"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="506"/> <source>Press to send the input to the hg process</source> <translation>Hg işlem girdilerini göndermek için basınız</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="477"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="509"/> <source>&Send</source> <translation>&Gönder</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="512"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="519"/> <source>Enter data to be sent to the hg process</source> <translation>Hg işlemlerine göndermek için verileri giriniz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="526"/> <source>Select to switch the input field to password mode</source> <translation>Giriş alanını parola moduna çevirmek için seçiniz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="529"/> <source>&Password Mode</source> <translation>&Parola Modu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="532"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> <source>Added</source> <translation>Eklendi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169"/> <source>Deleted</source> <translation>Silindi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source>Modified</source> <translation>Değiştirildi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="666"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="747"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="669"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="750"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="753"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="993"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="993"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> @@ -24899,32 +25063,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="77"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="147"/> <source>All</source> <translation>Hepsi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> <source>Bookmarks</source> <translation type="unfinished">Yerimleri</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="90"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> @@ -24934,83 +25098,83 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="227"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1899"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2091"/> <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/HgLogBrowserDialog.ui" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="444"/> <source>Select to show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="421"/> <source>Select action from menu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> - <source>Tag</source> - <translation type="unfinished">Etiket</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="204"/> - <source>Tag the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1773"/> - <source>Switch</source> - <translation type="unfinished">Değiştirmek</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="209"/> - <source>Switch the working directory to the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/> + <source>Tag</source> + <translation type="unfinished">Etiket</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="235"/> + <source>Tag the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1951"/> + <source>Switch</source> + <translation type="unfinished">Değiştirmek</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="240"/> + <source>Switch the working directory to the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="265"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="983"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1087"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -25035,343 +25199,257 @@ <translation type="unfinished">Sonraki eşlişmeyi bulmak için basınız</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Find</source> <translation type="unfinished">Bul</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Filter</source> <translation type="unfinished">Süzgeç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> - <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Etiketler</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2192"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2192"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' bulunamadı.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/> <source>File</source> <translation type="unfinished">Dosya</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174"/> <source>Draft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> <source>Public</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/> <source>Secret</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2049"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="261"/> <source>Pull changes from a remote repository</source> <translation type="unfinished">Değişiklileri uzak kaynak havuzundan çek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="274"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1852"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2030"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2091"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> <source>Fetch changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="291"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="245"/> <source>Define Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="248"/> <source>Bookmark the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250"/> <source>Move Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253"/> <source>Move bookmark to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1972"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1972"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1816"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1994"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1816"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1994"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1937"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr><tr><td><b>Children</b></td><td>{5}</td></tr>{6}</table></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="368"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> + <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="14"/> <source>Mercurial Log</source> - <translation>Mercurial Günlüğü</translation> + <translation type="obsolete">Mercurial Günlüğü</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="26"/> <source>Log</source> - <translation>Günlük</translation> + <translation type="obsolete">Günlük</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="32"/> <source><b>Mercurial Log</b><p>This shows the output of the hg log command. By clicking on the links you may show the difference between revisions.</p></source> - <translation><b>Mercurial Günlüğü</b><p>Bu hg günlüğü komutunun çıktısıını gösterir. Bağlantıdaki adresi tıklarsanız iki güncelleme arasındaki farklılıkları görürsünü.</p></translation> + <translation type="obsolete"><b>Mercurial Günlüğü</b><p>Bu hg günlüğü komutunun çıktısıını gösterir. Bağlantıdaki adresi tıklarsanız iki güncelleme arasındaki farklılıkları görürsünü.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="61"/> <source>Errors</source> - <translation>Hatalar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="67"/> - <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> - <translation type="unfinished"></translation> + <translation type="obsolete">Hatalar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="83"/> <source>Input</source> - <translation>Girdi</translation> + <translation type="obsolete">Girdi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="105"/> <source>Press to send the input to the hg process</source> - <translation>Hg işlem girdilerini göndermek için basınız</translation> + <translation type="obsolete">Hg işlem girdilerini göndermek için basınız</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="108"/> <source>&Send</source> - <translation>&Gönder</translation> + <translation type="obsolete">&Gönder</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="111"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="118"/> <source>Enter data to be sent to the hg process</source> - <translation>Hg işlemlerine göndermek için verileri giriniz</translation> + <translation type="obsolete">Hg işlemlerine göndermek için verileri giriniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="125"/> <source>Select to switch the input field to password mode</source> - <translation>Giriş alanını parola moduna çevirmek için seçiniz</translation> + <translation type="obsolete">Giriş alanını parola moduna çevirmek için seçiniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="128"/> <source>&Password Mode</source> - <translation>&Parola Modu</translation> + <translation type="obsolete">&Parola Modu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="131"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="64"/> <source><b>Processing your request, please wait...</b></source> - <translation><b>İsteğiniz yerine getirilyor, lütfen bekleyiniz...</b></translation> + <translation type="obsolete"><b>İsteğiniz yerine getirilyor, lütfen bekleyiniz...</b></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="74"/> <source>Revision</source> - <translation>Gözden Geçirme</translation> + <translation type="obsolete">Gözden Geçirme</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> <source>Process Generation Error</source> - <translation>İşlem Üretecinde Hata</translation> + <translation type="obsolete">İşlem Üretecinde Hata</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="270"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> - <source>Could not start the hg executable.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="276"/> - <source>Mercurial Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/> - <source>No log available for '{0}'</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="344"/> <source>diff to {0}</source> - <translation>{0}ne farkı</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="358"/> - <source>Tags: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="364"/> - <source>Parents: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="367"/> - <source><i>Author: {0}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="371"/> - <source><i>Date: {0}, {1}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="382"/> - <source>Added {0} (copied from {1})<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="387"/> - <source>Added {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="393"/> - <source>Modified {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="399"/> - <source>Deleted {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="361"/> - <source>Bookmarks: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="352"/> - <source>Phase: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="45"/> - <source>Select to show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="48"/> - <source>Show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="355"/> - <source>Branch: {0}<br /> -</source> - <translation type="unfinished"></translation> + <translation type="obsolete">{0}ne farkı</translation> </message> </context> <context> @@ -25739,87 +25817,87 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="605"/> <source>Version Control</source> <translation>Sürüm Kontrol</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="617"/> <source>Commit changes to repository...</source> <translation>Yapılan değişiklekleri kaynak havuzuna teslim et...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> <source>Add to repository</source> <translation>Kaynak havuzuna ekle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628"/> <source>Remove from repository (and disk)</source> <translation>Kaynak havuzundan kaldır (ve diskten)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Remove from repository only</source> <translation>Yalnızca kaynak havuzundan kaldır</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="548"/> <source>Show log</source> - <translation>Kayıtı göster</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="552"/> + <translation type="obsolete">Kayıtı göster</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="544"/> <source>Show log browser</source> <translation>Kayıt gözatıcısını gösted</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> <source>Show status</source> <translation>Durumu Göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="343"/> <source>Show annotated file</source> <translation>Açıklama dosyalarını göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Revert changes</source> <translation>Değişiklikleri başa döndür</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="663"/> <source>Select all local file entries</source> <translation>tüm yerel dosyalırın girişini seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="665"/> <source>Select all versioned file entries</source> <translation>Giriş yapılan tüm dosyaları seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> <source>Select all local directory entries</source> <translation>Tüm yerel dizin kalemlerini seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="669"/> <source>Select all versioned directory entries</source> <translation>Giriş yapılan tüm dizinleri seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Do you really want to remove these files from the repository?</source> <translation>Bu dosyaları gerçekten kaynak havuzundan kaldırmak istiyor musunuz?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="539"/> <source>Copy</source> <translation type="unfinished">Kopyala</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="541"/> <source>Move</source> <translation type="unfinished"></translation> </message> @@ -25829,42 +25907,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="639"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="329"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="651"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="643"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="338"/> <source>Show differences side-by-side (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="653"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="656"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="672"/> <source>Configure...</source> <translation type="unfinished">Ayarlanıyor...</translation> </message> @@ -26013,581 +26091,561 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> - <source>Show log</source> - <translation>Kayıtı göster</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> - <source>Show &log</source> - <translation>Kayıtı &göster</translation> + <source>Show log browser</source> + <translation>Kayıt gözatıcısını gösted</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> - <source>Show the log of the local project</source> - <translation>Yerel projenin günlük kaydını göster</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> - <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> - <source>Show log browser</source> - <translation>Kayıt gözatıcısını gösted</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> - <source>Show a dialog to browse the log of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show &difference</source> <translation>Farkları gös&ter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> <source>Show status</source> <translation>Durumu Göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> <source>Show the status of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> <source>Show heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Show the heads of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357"/> <source>Show parents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Show the parents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="371"/> <source>Show tip</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <source>Show the tip of the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> + <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <source>Revert changes</source> + <translation>Değişiklikleri başa döndür</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <source>Re&vert changes</source> + <translation>Değişiklikleri ba&şa döndür</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> - <source>Show the tip of the repository</source> + <source>Revert all changes made to the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> - <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> - <source>Revert changes</source> - <translation>Değişiklikleri başa döndür</translation> + <source>Merge</source> + <translation>Birleştir</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> - <source>Re&vert changes</source> - <translation>Değişiklikleri ba&şa döndür</translation> + <source>Mer&ge changes...</source> + <translation>De&ğişiklikleri birleştir...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> - <source>Revert all changes made to the local project</source> + <source>Merge changes of a revision into the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> - <source>Merge</source> - <translation>Birleştir</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> - <source>Mer&ge changes...</source> - <translation>De&ğişiklikleri birleştir...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> - <source>Merge changes of a revision into the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <source>Tag in repository</source> + <translation>Kaynak havuzu etiketi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <source>&Tag in repository...</source> + <translation>Kaynak havuzu e&tiketi...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <source>Tag the local project in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> - <source>Tag in repository</source> - <translation>Kaynak havuzu etiketi</translation> + <source>List tags</source> + <translation>Etiketleri listele</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> - <source>&Tag in repository...</source> - <translation>Kaynak havuzu e&tiketi...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> - <source>Tag the local project in the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> - <source>List tags</source> - <translation>Etiketleri listele</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags...</source> <translation>Etiketleri listele...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>List branches</source> <translation>Branşlar listesi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>List branches...</source> <translation>Branşlar listesi...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> + <source>List branches of the project</source> + <translation>Prosenin branşlar listesi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Branş listesi</b><p>Bu listeler prosenin branş listeleridir.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create &branch...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> - <source>List branches of the project</source> - <translation>Prosenin branşlar listesi</translation> + <source>Create a new branch for the local project in the repository</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Branş listesi</b><p>Bu listeler prosenin branş listeleridir.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Create branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Create &branch...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> - <source>Create a new branch for the local project in the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> <source>Close branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> <source>Close the current branch of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> <source>Show current branch</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Show the current branch of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <source>Switch</source> + <translation>Değiştirmek</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <source>S&witch...</source> + <translation>Deği&ştirmek...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> - <source>Show the current branch of the project</source> + <source>Switch the working directory to another revision</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> - <source>Switch</source> - <translation>Değiştirmek</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> - <source>S&witch...</source> - <translation>Deği&ştirmek...</translation> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Cleanup</source> + <translation>Temizle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Cleanu&p</source> + <translation>Temi&zle</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Switch the working directory to another revision</source> - <translation type="unfinished"></translation> + <source>Cleanup the local project</source> + <translation>Yerel projeyi temizle</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> - <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source>Cleanup</source> - <translation>Temizle</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source>Cleanu&p</source> - <translation>Temi&zle</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> - <source>Cleanup the local project</source> - <translation>Yerel projeyi temizle</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Temizle</b><p>Bu yerel projeyi sıfırlar.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source>Execute command</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <source>E&xecute command...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <source>Execute an arbitrary Mercurial command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>E&xecute command...</source> - <translation type="unfinished"></translation> + <source>Configure</source> + <translation>Yapılandırma</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source>Configure...</source> + <translation>Ayarlanıyor...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> - <source>Execute an arbitrary Mercurial command</source> + <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Configure</source> - <translation>Yapılandırma</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Configure...</source> - <translation>Ayarlanıyor...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> - <source>Show the configuration dialog with the Mercurial page selected</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup</source> + <translation>Değişimgrubu oluştur</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> - <source>Create a .hgignore file with default values</source> + <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> - <source>Create changegroup</source> - <translation>Değişimgrubu oluştur</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> - <source>Create changegroup...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> - <source>Create changegroup file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1793"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <source>Mark as "good"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> - <source>Apply one or several changegroup files</source> + <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> - <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source>Mark as "good"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source>Mark as "good"...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <source>Skip</source> <translation>Atla</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> <source>Reset</source> <translation>Başadön</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -26607,687 +26665,687 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1300"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1627"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1610"/> <source>Pull</source> <translation>Çekmek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> <source>The project should be reread. Do this now?</source> <translation>Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <source>Show an editor to edit the repository configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Edit repository configuration</source> + <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Edit repository configuration...</source> + <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> - <source>Show an editor to edit the repository configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1849"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1316"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1869"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Export Patches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <source>Export revisions to patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> - <source>Export Patches</source> + <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> - <source>Export Patches...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1889"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> - <source>Change the phase of revisions</source> + <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> - <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1906"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1393"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/> - <source>Copy Changesets (Continue)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <source>Add</source> + <translation type="unfinished">Ekle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <source>Add...</source> + <translation type="unfinished">Ekle...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <source>Add a sub-repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Add</source> - <translation type="unfinished">Ekle</translation> + <source>Remove</source> + <translation type="unfinished">Kaldır</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Add...</source> - <translation type="unfinished">Ekle...</translation> + <source>Remove...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> - <source>Add a sub-repository</source> + <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> - <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> - <source>Remove</source> - <translation type="unfinished">Kaldır</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> - <source>Remove...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> - <source>Remove sub-repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> + <source>Show &status...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <source>Show Summary</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> - <source>Show &status...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> - <source>Show Summary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show summary...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> <source>Show summary information of the working directory status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> <source>Cancel uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> <source>Cancel an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <source>List bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <source>List bookmarks...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <source>List bookmarks of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>List bookmarks</source> + <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>List bookmarks...</source> + <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> - <source>List bookmarks of the project</source> + <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Define bookmark</source> + <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Define bookmark...</source> + <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> - <source>Define a bookmark for the project</source> + <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Delete bookmark</source> + <source>Rename bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Delete bookmark...</source> + <source>Rename bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <source>Delete a bookmark of the project</source> + <source>Rename a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Rename bookmark</source> + <source>Move bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Rename bookmark...</source> + <source>Move bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> - <source>Rename a bookmark of the project</source> + <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source>Move bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source>Move bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> - <source>Move a bookmark of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1144"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> <source>Show incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Pull bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> <source>Bookmarks</source> <translation type="unfinished">Yerimleri</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <source>Re-Merge all conflicting, unresolved files of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> - <source>Re-Merge all conflicting, unresolved files of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Show conflicts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Show conflicts...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> - <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> - <source>Conflicts unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> - <source>Mark all conflicts of the local project as unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> - <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> - <source>Manage Changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> + <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <source>Mark all conflicts of the local project as unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> + <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> + <source>Manage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>Mercurial</source> <translation type="unfinished">Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> @@ -28547,6 +28605,7 @@ <source>%n file(s) changed</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message numerus="yes"> @@ -28554,6 +28613,7 @@ <source>%n line(s) inserted</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message numerus="yes"> @@ -28561,6 +28621,7 @@ <source>%n line(s) deleted</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message> @@ -29303,6 +29364,7 @@ <source>%n new changeset(s)<br/>Update required</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message numerus="yes"> @@ -29310,6 +29372,7 @@ <source>%n new changeset(s)</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message numerus="yes"> @@ -29317,6 +29380,7 @@ <source>%n branch head(s)</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message> @@ -29330,6 +29394,7 @@ <source>%n incoming bookmark(s)</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message numerus="yes"> @@ -29337,6 +29402,7 @@ <source>%n outgoing bookmark(s)</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message> @@ -29349,6 +29415,7 @@ <source>%n file(s) to upload</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message> @@ -30301,6 +30368,7 @@ <source>%n item(s)</source> <translation> <numerusform>%n madde(ler)</numerusform> + <numerusform></numerusform> </translation> </message> </context> @@ -30338,6 +30406,42 @@ </message> </context> <context> + <name>HtmlProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/HtmlProvider.py" line="388"/> + <source>Create List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HtmlProvider.py" line="388"/> + <source>Enter desired number of list elements:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HyperlinkMarkupDialog</name> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="14"/> + <source>Insert Hyperlink</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="23"/> + <source>Link Text:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="33"/> + <source>Link Target:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="43"/> + <source>Link Title:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>IExplorerImporter</name> <message> <location filename="../WebBrowser/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="40"/> @@ -30539,1063 +30643,1088 @@ <translation>Windows Bitmap Dosyası (*.bmp)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="128"/> + <location filename="../IconEditor/IconEditorWindow.py" line="130"/> <source>Graphic Interchange Format File (*.gif)</source> <translation>Graphic Interchange Format Dosyası (*.gif)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="129"/> - <source>Windows Icon File (*.ico)</source> - <translation>Windows İkon Dosyası (*.ico)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="130"/> - <source>JPEG File (*.jpg)</source> - <translation>JPEG Dosyası (*.jpg)</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="132"/> - <source>Multiple-Image Network Graphics File (*.mng)</source> - <translation>Çoklu-Resim Ağ Grafik Dosyası (*.mng)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="133"/> - <source>Portable Bitmap File (*.pbm)</source> - <translation>Portable Bitmap Dosyası (*.pbm)</translation> + <source>Windows Icon File (*.ico)</source> + <translation>Windows İkon Dosyası (*.ico)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="134"/> - <source>Paintbrush Bitmap File (*.pcx)</source> - <translation>Paintbrush Bitmap Dosyası (*.pcx)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="135"/> - <source>Portable Graymap File (*.pgm)</source> - <translation>Portable Graymap Dosyası (*.pgm)</translation> + <source>JPEG File (*.jpg)</source> + <translation>JPEG Dosyası (*.jpg)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="136"/> - <source>Portable Network Graphics File (*.png)</source> - <translation>Portable Network Graphics Dosyası (*.png)</translation> + <source>Multiple-Image Network Graphics File (*.mng)</source> + <translation>Çoklu-Resim Ağ Grafik Dosyası (*.mng)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="137"/> - <source>Portable Pixmap File (*.ppm)</source> - <translation>Portable Pixmap Dosyası (*.ppm)</translation> + <source>Portable Bitmap File (*.pbm)</source> + <translation>Portable Bitmap Dosyası (*.pbm)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="138"/> - <source>Silicon Graphics Image File (*.sgi)</source> - <translation>Silikon Gragik Resim Dosyası (*.sgi)</translation> + <source>Paintbrush Bitmap File (*.pcx)</source> + <translation>Paintbrush Bitmap Dosyası (*.pcx)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="139"/> - <source>Scalable Vector Graphics File (*.svg)</source> - <translation>Ölçeklenebilir Vektörel Grafik Dosyası (*.svg)</translation> + <source>Portable Graymap File (*.pgm)</source> + <translation>Portable Graymap Dosyası (*.pgm)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="140"/> + <source>Portable Network Graphics File (*.png)</source> + <translation>Portable Network Graphics Dosyası (*.png)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="141"/> + <source>Portable Pixmap File (*.ppm)</source> + <translation>Portable Pixmap Dosyası (*.ppm)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="142"/> - <source>Targa Graphic File (*.tga)</source> - <translation>Targa Gragik Dosyası (*.tga)</translation> + <source>Silicon Graphics Image File (*.sgi)</source> + <translation>Silikon Gragik Resim Dosyası (*.sgi)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="143"/> - <source>TIFF File (*.tif)</source> - <translation>TIFF Dosyası (*.tif)</translation> + <source>Scalable Vector Graphics File (*.svg)</source> + <translation>Ölçeklenebilir Vektörel Grafik Dosyası (*.svg)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="146"/> - <source>X11 Bitmap File (*.xbm)</source> - <translation>X11 Bitmap Dosyası (*.xbm)</translation> + <source>Targa Graphic File (*.tga)</source> + <translation>Targa Gragik Dosyası (*.tga)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="147"/> + <source>TIFF File (*.tif)</source> + <translation>TIFF Dosyası (*.tif)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="151"/> + <source>X11 Bitmap File (*.xbm)</source> + <translation>X11 Bitmap Dosyası (*.xbm)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="152"/> <source>X11 Pixmap File (*.xpm)</source> <translation>X11 Pixmap Dosyası (*.xpm)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="158"/> + <location filename="../IconEditor/IconEditorWindow.py" line="163"/> <source>All Files (*)</source> <translation>Tüm Dosyalar (*)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>New</source> <translation>Yeni</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>&New</source> <translation>Ye&ni</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>Ctrl+N</source> <comment>File|New</comment> <translation>Ctrl+N</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="196"/> + <location filename="../IconEditor/IconEditorWindow.py" line="201"/> <source>Create a new icon</source> <translation>Yeni bir ikon oluştur</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="197"/> + <location filename="../IconEditor/IconEditorWindow.py" line="202"/> <source><b>New</b><p>This creates a new icon.</p></source> <translation><b>Yeni</b><p>Bu yeni bir icon oluşturur.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="204"/> + <location filename="../IconEditor/IconEditorWindow.py" line="209"/> <source>New Window</source> <translation>Yeni Pencere</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="204"/> - <source>New &Window</source> - <translation>Yeni &Pencere</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="209"/> + <source>New &Window</source> + <translation>Yeni &Pencere</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="214"/> <source>Open a new icon editor window</source> <translation>Yeni bir ikon düzenlem penceresi aç</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="211"/> + <location filename="../IconEditor/IconEditorWindow.py" line="216"/> <source><b>New Window</b><p>This opens a new icon editor window.</p></source> <translation><b>Yeni Pencere</b><p>Bu yeni bir ikon düzenleme penceresi açar.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>Open</source> <translation>Aç</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>&Open...</source> <translation>&Aç...</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>Ctrl+O</source> <comment>File|Open</comment> <translation>Ctrl+O</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="224"/> + <location filename="../IconEditor/IconEditorWindow.py" line="229"/> <source>Open an icon file for editing</source> <translation>Düzenlemek için bir ikon dosyası aç</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="225"/> + <location filename="../IconEditor/IconEditorWindow.py" line="230"/> <source><b>Open File</b><p>This opens a new icon file for editing. It pops up a file selection dialog.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>Save</source> <translation>Kaydet</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>&Save</source> <translation>&Kaydet</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>Ctrl+S</source> <comment>File|Save</comment> <translation>Ctrl+S</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="239"/> + <location filename="../IconEditor/IconEditorWindow.py" line="244"/> <source>Save the current icon</source> <translation>Geçerli ikonu kaydet</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="240"/> + <location filename="../IconEditor/IconEditorWindow.py" line="245"/> <source><b>Save File</b><p>Save the contents of the icon editor window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Save As</source> <translation>Farklı Kaydet</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Save &As...</source> <translation>Farklı K&aydet...</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Shift+Ctrl+S</source> <comment>File|Save As</comment> <translation>Shift+Ctrl+S</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="253"/> + <location filename="../IconEditor/IconEditorWindow.py" line="258"/> <source>Save the current icon to a new file</source> <translation>Geçerli ikonu yeni bir dosyaya kaydet</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="255"/> + <location filename="../IconEditor/IconEditorWindow.py" line="260"/> <source><b>Save As...</b><p>Saves the current icon to a new file.</p></source> <translation><b>Farklı Kaydet...</b><p>Geçerli ikonu yeni bir dosyaya kaydet.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>Close</source> <translation>Kapat</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>&Close</source> <translation>&Kapat</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>Ctrl+W</source> <comment>File|Close</comment> <translation>Ctrl+W</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="268"/> + <location filename="../IconEditor/IconEditorWindow.py" line="273"/> <source>Close the current icon editor window</source> <translation>Geçerli ikon düzenleme penceresini kapat</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="270"/> + <location filename="../IconEditor/IconEditorWindow.py" line="275"/> <source><b>Close</b><p>Closes the current icon editor window.</p></source> <translation><b>Kapat</b><p>Geçerli ikon düzenleyici penceresini kapat.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="277"/> + <location filename="../IconEditor/IconEditorWindow.py" line="282"/> <source>Close All</source> <translation>Hepsini Kapat</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="277"/> + <location filename="../IconEditor/IconEditorWindow.py" line="282"/> <source>Close &All</source> <translation>Hepsini K&apat</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="281"/> + <location filename="../IconEditor/IconEditorWindow.py" line="286"/> <source>Close all icon editor windows</source> <translation>Tüm ikon düzenleme pencerelerini kapat</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="283"/> + <location filename="../IconEditor/IconEditorWindow.py" line="288"/> <source><b>Close All</b><p>Closes all icon editor windows except the first one.</p></source> <translation><b>Hepsini Kapat</b><p>İlk açılan haricinde tüm ikon düzenleme pencerelerini kapat.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>Quit</source> <translation>Çık</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>&Quit</source> <translation>&Çıkış</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>Ctrl+Q</source> <comment>File|Quit</comment> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="309"/> + <location filename="../IconEditor/IconEditorWindow.py" line="314"/> <source>Quit the icon editor</source> <translation>İkon düzenleyiciden çık</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="310"/> + <location filename="../IconEditor/IconEditorWindow.py" line="315"/> <source><b>Quit</b><p>Quit the icon editor.</p></source> <translation><b>Çıkış</b><p>İcon düzenleyicidn çık.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Undo</source> <translation>Geri Al</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>&Undo</source> <translation>&Geri al</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Ctrl+Z</source> <comment>Edit|Undo</comment> <translation>Ctrl+Z</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Alt+Backspace</source> <comment>Edit|Undo</comment> <translation>Alt+Backspace</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="329"/> + <location filename="../IconEditor/IconEditorWindow.py" line="334"/> <source>Undo the last change</source> <translation>Enson değişikliği geri al</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="330"/> + <location filename="../IconEditor/IconEditorWindow.py" line="335"/> <source><b>Undo</b><p>Undo the last change done.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>Redo</source> <translation>İleri al</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>&Redo</source> <translation>&İleri al</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>Ctrl+Shift+Z</source> <comment>Edit|Redo</comment> <translation>Ctrl+Shift+Z</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="343"/> + <location filename="../IconEditor/IconEditorWindow.py" line="348"/> <source>Redo the last change</source> <translation>Son değişikliği ileri al</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="344"/> + <location filename="../IconEditor/IconEditorWindow.py" line="349"/> <source><b>Redo</b><p>Redo the last change done.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Cut</source> <translation>Kes</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Cu&t</source> <translation>Ke&s</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Ctrl+X</source> <comment>Edit|Cut</comment> <translation>Ctrl+X</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Shift+Del</source> <comment>Edit|Cut</comment> <translation>Shift+Del</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="358"/> + <location filename="../IconEditor/IconEditorWindow.py" line="363"/> <source>Cut the selection</source> <translation>Seçimi kes</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="359"/> + <location filename="../IconEditor/IconEditorWindow.py" line="364"/> <source><b>Cut</b><p>Cut the selected image area to the clipboard.</p></source> <translation><b>Kes</b><p>Seçilen resim alanı panoya aktararak keser.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Copy</source> <translation>Kopyala</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>&Copy</source> <translation>&Kopyala</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Ctrl+C</source> <comment>Edit|Copy</comment> <translation>Ctrl+C</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Ctrl+Ins</source> <comment>Edit|Copy</comment> <translation>Ctrl+Ins</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="373"/> + <location filename="../IconEditor/IconEditorWindow.py" line="378"/> <source>Copy the selection</source> <translation>Seçimi kopyala</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="374"/> + <location filename="../IconEditor/IconEditorWindow.py" line="379"/> <source><b>Copy</b><p>Copy the selected image area to the clipboard.</p></source> <translation><b>Kopya</b><p>Seçilen görüntüyü panoya kopyala.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Paste</source> <translation>Yapıştır</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>&Paste</source> <translation>Ya&pıştır</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Ctrl+V</source> <comment>Edit|Paste</comment> <translation>Ctrl+V</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Shift+Ins</source> <comment>Edit|Paste</comment> <translation>Shift+Ins</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="388"/> + <location filename="../IconEditor/IconEditorWindow.py" line="393"/> <source>Paste the clipboard image</source> <translation>Panodaki görüntüyü yapıştır</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="389"/> + <location filename="../IconEditor/IconEditorWindow.py" line="394"/> <source><b>Paste</b><p>Paste the clipboard image.</p></source> <translation><b>Yapıştır</b><p>Panodaki resmi yapıştır.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="396"/> + <location filename="../IconEditor/IconEditorWindow.py" line="401"/> <source>Paste as New</source> <translation>Yeni olarak yapıştır</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="396"/> + <location filename="../IconEditor/IconEditorWindow.py" line="401"/> <source>Paste as &New</source> <translation>Ye&ni olarak yapıştır</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="400"/> + <location filename="../IconEditor/IconEditorWindow.py" line="405"/> <source>Paste the clipboard image replacing the current one</source> <translation>Mevcut bir tanesinin üzerine panodan bir resim yapıştır</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="402"/> + <location filename="../IconEditor/IconEditorWindow.py" line="407"/> <source><b>Paste as New</b><p>Paste the clipboard image replacing the current one.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Clear</source> <translation>Temizle</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Cl&ear</source> <translation>T&emizle</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Alt+Shift+C</source> <comment>Edit|Clear</comment> <translation>Alt+Shift+C</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="416"/> + <location filename="../IconEditor/IconEditorWindow.py" line="421"/> <source>Clear the icon image</source> <translation>İkon görüntüsünü temizle</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="417"/> + <location filename="../IconEditor/IconEditorWindow.py" line="422"/> <source><b>Clear</b><p>Clear the icon image and set it to be completely transparent.</p></source> <translation><b>Temizle</b><p>İkon resmini temizle ve tamamını transparan yap.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>Select All</source> <translation>Hepsini Seç</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>&Select All</source> <translation>Hep&sini Seç</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>Ctrl+A</source> <comment>Edit|Select All</comment> <translation>Ctrl+A</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="431"/> + <location filename="../IconEditor/IconEditorWindow.py" line="436"/> <source>Select the complete icon image</source> <translation>Tüm ikon resmini seç</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="433"/> + <location filename="../IconEditor/IconEditorWindow.py" line="438"/> <source><b>Select All</b><p>Selects the complete icon image.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="440"/> + <location filename="../IconEditor/IconEditorWindow.py" line="445"/> <source>Change Size</source> <translation>Boyutları Değiştir</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="440"/> + <location filename="../IconEditor/IconEditorWindow.py" line="445"/> <source>Change Si&ze...</source> <translation>Boyutları De&ğiştir...</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="446"/> + <location filename="../IconEditor/IconEditorWindow.py" line="451"/> <source>Change the icon size</source> <translation>İkon boyutunu değiştir</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="447"/> + <location filename="../IconEditor/IconEditorWindow.py" line="452"/> <source><b>Change Size...</b><p>Changes the icon size.</p></source> <translation><b>Boyut Değşikliği...</b><p>İkon boyutunu değiştirir.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="454"/> + <location filename="../IconEditor/IconEditorWindow.py" line="459"/> <source>Grayscale</source> <translation>Griskala</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="454"/> + <location filename="../IconEditor/IconEditorWindow.py" line="459"/> <source>&Grayscale</source> <translation>&Griskala</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="460"/> + <location filename="../IconEditor/IconEditorWindow.py" line="465"/> <source>Change the icon to grayscale</source> <translation>İkonu griskala ya çevir</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="462"/> + <location filename="../IconEditor/IconEditorWindow.py" line="467"/> <source><b>Grayscale</b><p>Changes the icon to grayscale.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Zoom in</source> <translation>Büyüt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Zoom &in</source> <translation>Bü&yült</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Ctrl++</source> <comment>View|Zoom in</comment> <translation>Ctrl++</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="497"/> + <location filename="../IconEditor/IconEditorWindow.py" line="502"/> <source>Zoom in on the icon</source> <translation>İkın üzerinde büyüt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="498"/> + <location filename="../IconEditor/IconEditorWindow.py" line="503"/> <source><b>Zoom in</b><p>Zoom in on the icon. This makes the grid bigger.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Zoom out</source> <translation>Küçült</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Zoom &out</source> <translation>Küçü&lt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Ctrl+-</source> <comment>View|Zoom out</comment> <translation>Ctrl+-</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="511"/> + <location filename="../IconEditor/IconEditorWindow.py" line="516"/> <source>Zoom out on the icon</source> <translation>İkon üzerinde küçült</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="512"/> + <location filename="../IconEditor/IconEditorWindow.py" line="517"/> <source><b>Zoom out</b><p>Zoom out on the icon. This makes the grid smaller.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Zoom reset</source> <translation>Büyütmeyi sıfırla</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Zoom &reset</source> <translation>Büyütmeyi sıfı&rla</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Ctrl+0</source> <comment>View|Zoom reset</comment> <translation>Ctrl+0</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="525"/> + <location filename="../IconEditor/IconEditorWindow.py" line="530"/> <source>Reset the zoom of the icon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="527"/> + <location filename="../IconEditor/IconEditorWindow.py" line="532"/> <source><b>Zoom reset</b><p>Reset the zoom of the icon. This sets the zoom factor to 100%.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="535"/> + <location filename="../IconEditor/IconEditorWindow.py" line="540"/> <source>Show Grid</source> <translation>Grid Çizgilerini Göster</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="535"/> + <location filename="../IconEditor/IconEditorWindow.py" line="540"/> <source>Show &Grid</source> <translation>&Grid Çizgilerini Göster</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="541"/> + <location filename="../IconEditor/IconEditorWindow.py" line="546"/> <source>Toggle the display of the grid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="543"/> + <location filename="../IconEditor/IconEditorWindow.py" line="548"/> <source><b>Show Grid</b><p>Toggle the display of the grid.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="562"/> + <location filename="../IconEditor/IconEditorWindow.py" line="567"/> <source>Freehand</source> <translation>Serbest çizim</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="562"/> + <location filename="../IconEditor/IconEditorWindow.py" line="567"/> <source>&Freehand</source> <translation>&Serbest çizim</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="568"/> + <location filename="../IconEditor/IconEditorWindow.py" line="573"/> <source><b>Free hand</b><p>Draws non linear lines.</p></source> <translation><b>Serbest Çizim</b><p>Düzgün olmayan çizgiler çizer.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="577"/> + <location filename="../IconEditor/IconEditorWindow.py" line="582"/> <source>Color Picker</source> <translation>Renk Toplayıcı</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="577"/> + <location filename="../IconEditor/IconEditorWindow.py" line="582"/> <source>&Color Picker</source> <translation>Renk Toplayı&cı</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="583"/> + <location filename="../IconEditor/IconEditorWindow.py" line="588"/> <source><b>Color Picker</b><p>The color of the pixel clicked on will become the current draw color.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="594"/> + <location filename="../IconEditor/IconEditorWindow.py" line="599"/> <source>Rectangle</source> <translation>Dikdörtgen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="594"/> + <location filename="../IconEditor/IconEditorWindow.py" line="599"/> <source>&Rectangle</source> <translation>Dikdö&rtgen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="600"/> + <location filename="../IconEditor/IconEditorWindow.py" line="605"/> <source><b>Rectangle</b><p>Draw a rectangle.</p></source> <translation><b>Dikdörtgen</b><p>Bir dikdörtgen çiz.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="609"/> + <location filename="../IconEditor/IconEditorWindow.py" line="614"/> <source>Filled Rectangle</source> <translation>İçidolu Dikdörtgen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="609"/> + <location filename="../IconEditor/IconEditorWindow.py" line="614"/> <source>F&illed Rectangle</source> <translation>İçido&lu Dikdörtgen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="615"/> + <location filename="../IconEditor/IconEditorWindow.py" line="620"/> <source><b>Filled Rectangle</b><p>Draw a filled rectangle.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="625"/> + <location filename="../IconEditor/IconEditorWindow.py" line="630"/> <source>Circle</source> <translation>Çember</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="631"/> + <location filename="../IconEditor/IconEditorWindow.py" line="636"/> <source><b>Circle</b><p>Draw a circle.</p></source> <translation><b>Çember</b><p>Bir çember çiz.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="640"/> + <location filename="../IconEditor/IconEditorWindow.py" line="645"/> <source>Filled Circle</source> <translation>Daire</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="640"/> + <location filename="../IconEditor/IconEditorWindow.py" line="645"/> <source>Fille&d Circle</source> <translation>&Daire</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="646"/> + <location filename="../IconEditor/IconEditorWindow.py" line="651"/> <source><b>Filled Circle</b><p>Draw a filled circle.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="656"/> + <location filename="../IconEditor/IconEditorWindow.py" line="661"/> <source>Ellipse</source> <translation>Elips</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="656"/> + <location filename="../IconEditor/IconEditorWindow.py" line="661"/> <source>&Ellipse</source> <translation>&Elips</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="662"/> + <location filename="../IconEditor/IconEditorWindow.py" line="667"/> <source><b>Ellipse</b><p>Draw an ellipse.</p></source> <translation><b>Elips</b><p>Bir elips çiz.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="671"/> + <location filename="../IconEditor/IconEditorWindow.py" line="676"/> <source>Filled Ellipse</source> <translation>İçidolu Elips</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="671"/> + <location filename="../IconEditor/IconEditorWindow.py" line="676"/> <source>Fille&d Elli&pse</source> <translation>İçi dolu Eli&ps</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="677"/> + <location filename="../IconEditor/IconEditorWindow.py" line="682"/> <source><b>Filled Ellipse</b><p>Draw a filled ellipse.</p></source> <translation><b>İçi dolu Elips</b><p>İçi dolu bir elips çiz.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="687"/> + <location filename="../IconEditor/IconEditorWindow.py" line="692"/> <source>Flood Fill</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="687"/> + <location filename="../IconEditor/IconEditorWindow.py" line="692"/> <source>Fl&ood Fill</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="693"/> + <location filename="../IconEditor/IconEditorWindow.py" line="698"/> <source><b>Flood Fill</b><p>Fill adjoining pixels with the same color with the current color.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="703"/> + <location filename="../IconEditor/IconEditorWindow.py" line="708"/> <source>Line</source> <translation>Satır</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="703"/> + <location filename="../IconEditor/IconEditorWindow.py" line="708"/> <source>&Line</source> <translation>&Satır</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="709"/> + <location filename="../IconEditor/IconEditorWindow.py" line="714"/> <source><b>Line</b><p>Draw a line.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="718"/> + <location filename="../IconEditor/IconEditorWindow.py" line="723"/> <source>Eraser (Transparent)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="718"/> + <location filename="../IconEditor/IconEditorWindow.py" line="723"/> <source>Eraser (&Transparent)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="724"/> + <location filename="../IconEditor/IconEditorWindow.py" line="729"/> <source><b>Eraser (Transparent)</b><p>Erase pixels by setting them to transparent.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="733"/> + <location filename="../IconEditor/IconEditorWindow.py" line="738"/> <source>Rectangular Selection</source> <translation>Köşeli Seçim</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="750"/> + <location filename="../IconEditor/IconEditorWindow.py" line="755"/> <source>Rect&angular Selection</source> <translation>Kö&şeli Seçim</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="739"/> + <location filename="../IconEditor/IconEditorWindow.py" line="744"/> <source><b>Rectangular Selection</b><p>Select a rectangular section of the icon using the mouse.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="750"/> + <location filename="../IconEditor/IconEditorWindow.py" line="755"/> <source>Circular Selection</source> <translation>Dairesel Seçim</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="756"/> + <location filename="../IconEditor/IconEditorWindow.py" line="761"/> <source><b>Circular Selection</b><p>Select a circular section of the icon using the mouse.</p></source> <translation><b>Dairesel seçim</b><p>Fareyi kullanarak ikon üzerinde dairesel bir alanı seçiniz.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="773"/> + <location filename="../IconEditor/IconEditorWindow.py" line="778"/> <source>About</source> <translation>Hakkında</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="773"/> + <location filename="../IconEditor/IconEditorWindow.py" line="778"/> <source>&About</source> <translation>H&akkında</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="777"/> + <location filename="../IconEditor/IconEditorWindow.py" line="782"/> <source>Display information about this software</source> <translation>Bu yazılım hakkında bilgi göster</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="779"/> + <location filename="../IconEditor/IconEditorWindow.py" line="784"/> <source><b>About</b><p>Display some information about this software.</p></source> <translation><b>Hakkında</b><p>Bu yazılım hakkındaki çeşitli bilgileri gösterir.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="785"/> + <location filename="../IconEditor/IconEditorWindow.py" line="790"/> <source>About Qt</source> <translation>Qt Hakkında</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="785"/> + <location filename="../IconEditor/IconEditorWindow.py" line="790"/> <source>About &Qt</source> <translation>&Qt Hakkında</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="789"/> + <location filename="../IconEditor/IconEditorWindow.py" line="794"/> <source>Display information about the Qt toolkit</source> <translation>Qt araçkiti hakkında bilgi göster</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="791"/> + <location filename="../IconEditor/IconEditorWindow.py" line="796"/> <source><b>About Qt</b><p>Display some information about the Qt toolkit.</p></source> <translation><b>Qt Hakkında</b><p>Qt Araçkiti hakkında bazı bilgiler gösterir.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>What's This?</source> <translation>Bu nedir?</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>&What's This?</source> <translation>Bu &Nedir?</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>Shift+F1</source> <comment>Help|What's This?'</comment> <translation>Shift+F1</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="804"/> + <location filename="../IconEditor/IconEditorWindow.py" line="809"/> <source>Context sensitive help</source> <translation>Duyarlı yardım</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="805"/> + <location filename="../IconEditor/IconEditorWindow.py" line="810"/> <source><b>Display context sensitive help</b><p>In What's This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.</p></source> <translation><b>Duyarlı yardım içeriğini görüntüle</b><p>Bu Nedir? modunda, Fare imleci soru işeretiyle beraber bir ok şeklindedir ve bir arayüz elemanı üzerinde tıklarsanız bu elemanın nasıl kullanılacağı ve hakkında kısa bilgi verir. bu özellik diyaloglarda başlık çubuğu üzerindeyken çıkarılan açılır menülerde de bulunmaktadır.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="822"/> + <location filename="../IconEditor/IconEditorWindow.py" line="827"/> <source>&File</source> <translation>&Dosya</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="839"/> + <location filename="../IconEditor/IconEditorWindow.py" line="844"/> <source>&Edit</source> <translation>Düz&en</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="855"/> + <location filename="../IconEditor/IconEditorWindow.py" line="860"/> <source>&View</source> <translation>&Görünüm</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="863"/> + <location filename="../IconEditor/IconEditorWindow.py" line="868"/> <source>&Tools</source> <translation>&Araçlar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="882"/> + <location filename="../IconEditor/IconEditorWindow.py" line="887"/> <source>&Help</source> <translation>&Yardım</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="892"/> + <location filename="../IconEditor/IconEditorWindow.py" line="897"/> <source>File</source> <translation>Dosya</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="906"/> + <location filename="../IconEditor/IconEditorWindow.py" line="911"/> <source>Edit</source> <translation>Düzen</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="919"/> - <source>View</source> - <translation>Görünüm</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="924"/> + <source>View</source> + <translation>Görünüm</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="929"/> <source>Tools</source> <translation>Araçlar</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="942"/> + <location filename="../IconEditor/IconEditorWindow.py" line="947"/> <source>Help</source> <translation>Yardım</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="956"/> + <location filename="../IconEditor/IconEditorWindow.py" line="961"/> <source><p>This part of the status bar displays the icon size.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="963"/> + <location filename="../IconEditor/IconEditorWindow.py" line="968"/> <source><p>This part of the status bar displays the cursor position.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1059"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1064"/> <source>Open icon file</source> <translation>İkon dosyasını aç</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1109"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1114"/> <source>Save icon file</source> <translation>İkon dosyasını kaydet</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1145"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1150"/> <source>The file '{0}' does not exist.</source> <translation>'{0}' dosyası mevcut değil.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1152"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1157"/> <source>Cannot read file '{0}: {1}.</source> <translation>Dosya okunumıyor '{0}: {1}.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1186"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1191"/> <source>Cannot write file '{0}: {1}.</source> <translation>Dosyaya yazılamıyor '{0}: {1}.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1198"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1203"/> <source>Icon saved</source> <translation>İkon kaydedildi</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1213"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1218"/> <source>Untitled</source> <translation>Başlıksız</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1217"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1222"/> <source>{0}[*] - {1}</source> <translation>{0}[*] - {1}</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1217"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1222"/> <source>Icon Editor</source> <translation>İkon Düzenleyici</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1109"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1114"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p><b>{0}</b> dosyası halen mevcut. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1238"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1243"/> <source>The icon image has unsaved changes.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../IconEditor/IconEditorWindow.py" line="135"/> + <source>JPEG File (*.jpeg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="144"/> + <source>Compressed Scalable Vector Graphics File (*.svgz)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="148"/> + <source>TIFF File (*.tiff)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="149"/> + <source>WAP Bitmap File (*.wbmp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="1243"/> + <source>eric6 Icon Editor</source> + <translation type="unfinished">eric5 İkon Düzenleyici {6 ?}</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="1333"/> + <source>About eric6 Icon Editor</source> + <translation type="unfinished">eric5 İkon Düzenleyici Hakkında {6 ?}</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="1333"/> + <source>The eric6 Icon Editor is a simple editor component to perform icon drawing tasks.</source> + <translation type="unfinished">Eric5İcon Düzenleyici icon çizme görevlerini yerine getirmek için hazırlanmış basit bir düzenleyici bileşenidir. {6 ?}</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="295"/> + <source>Close Others</source> + <translation type="unfinished">Diğerlerini Kapat</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="299"/> + <source>Close all other icon editor windows</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="301"/> + <source><b>Close Others</b><p>Closes all other icon editor windows.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="150"/> + <source>WebP Image File (*.webp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="128"/> + <source>Windows Cursor File (*.cur)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="129"/> + <source>DirectDraw-Surface File (*.dds)</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../IconEditor/IconEditorWindow.py" line="131"/> - <source>JPEG File (*.jpeg)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="140"/> - <source>Compressed Scalable Vector Graphics File (*.svgz)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="144"/> - <source>TIFF File (*.tiff)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="145"/> - <source>WAP Bitmap File (*.wbmp)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1238"/> - <source>eric6 Icon Editor</source> - <translation type="unfinished">eric5 İkon Düzenleyici {6 ?}</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1328"/> - <source>About eric6 Icon Editor</source> - <translation type="unfinished">eric5 İkon Düzenleyici Hakkında {6 ?}</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1328"/> - <source>The eric6 Icon Editor is a simple editor component to perform icon drawing tasks.</source> - <translation type="unfinished">Eric5İcon Düzenleyici icon çizme görevlerini yerine getirmek için hazırlanmış basit bir düzenleyici bileşenidir. {6 ?}</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="290"/> - <source>Close Others</source> - <translation type="unfinished">Diğerlerini Kapat</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="294"/> - <source>Close all other icon editor windows</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="296"/> - <source><b>Close Others</b><p>Closes all other icon editor windows.</p></source> + <source>Apple Icon File (*.icns)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="133"/> + <source>JPEG2000 File (*.jp2)</source> <translation type="unfinished"></translation> </message> </context> @@ -31704,6 +31833,189 @@ </message> </context> <context> + <name>ImageMarkupDialog</name> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="53"/> + <source>Windows Bitmap File (*.bmp)</source> + <translation type="unfinished">Windows Bitmap Dosyası (*.bmp)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="54"/> + <source>Windows Cursor File (*.cur)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="55"/> + <source>DirectDraw-Surface File (*.dds)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="56"/> + <source>Graphic Interchange Format File (*.gif)</source> + <translation type="unfinished">Graphic Interchange Format Dosyası (*.gif)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="57"/> + <source>Apple Icon File (*.icns)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="58"/> + <source>Windows Icon File (*.ico)</source> + <translation type="unfinished">Windows İkon Dosyası (*.ico)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="59"/> + <source>JPEG2000 File (*.jp2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="60"/> + <source>JPEG File (*.jpg)</source> + <translation type="unfinished">JPEG Dosyası (*.jpg)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="61"/> + <source>JPEG File (*.jpeg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="62"/> + <source>Multiple-Image Network Graphics File (*.mng)</source> + <translation type="unfinished">Çoklu-Resim Ağ Grafik Dosyası (*.mng)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="63"/> + <source>Portable Bitmap File (*.pbm)</source> + <translation type="unfinished">Portable Bitmap Dosyası (*.pbm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="64"/> + <source>Paintbrush Bitmap File (*.pcx)</source> + <translation type="unfinished">Paintbrush Bitmap Dosyası (*.pcx)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="65"/> + <source>Portable Graymap File (*.pgm)</source> + <translation type="unfinished">Portable Graymap Dosyası (*.pgm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="66"/> + <source>Portable Network Graphics File (*.png)</source> + <translation type="unfinished">Portable Network Graphics Dosyası (*.png)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="67"/> + <source>Portable Pixmap File (*.ppm)</source> + <translation type="unfinished">Portable Pixmap Dosyası (*.ppm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="68"/> + <source>Silicon Graphics Image File (*.sgi)</source> + <translation type="unfinished">Silikon Gragik Resim Dosyası (*.sgi)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="69"/> + <source>Scalable Vector Graphics File (*.svg)</source> + <translation type="unfinished">Ölçeklenebilir Vektörel Grafik Dosyası (*.svg)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="70"/> + <source>Compressed Scalable Vector Graphics File (*.svgz)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="72"/> + <source>Targa Graphic File (*.tga)</source> + <translation type="unfinished">Targa Gragik Dosyası (*.tga)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="73"/> + <source>TIFF File (*.tif)</source> + <translation type="unfinished">TIFF Dosyası (*.tif)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="74"/> + <source>TIFF File (*.tiff)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="75"/> + <source>WAP Bitmap File (*.wbmp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="76"/> + <source>WebP Image File (*.webp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="77"/> + <source>X11 Bitmap File (*.xbm)</source> + <translation type="unfinished">X11 Bitmap Dosyası (*.xbm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="78"/> + <source>X11 Pixmap File (*.xpm)</source> + <translation type="unfinished">X11 Pixmap Dosyası (*.xpm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="89"/> + <source>All Files (*)</source> + <translation type="unfinished">Tüm Dosyalar (*)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="14"/> + <source>Add Image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="25"/> + <source>Image Address:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="41"/> + <source>Enter the image path or URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="48"/> + <source>Title:</source> + <translation type="unfinished">Başlık:</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="58"/> + <source>Alternative Text:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="73"/> + <source>Keep Original Size</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="80"/> + <source>Keep Aspect Ratio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="89"/> + <source>Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="119"/> + <source> px</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="109"/> + <source>Height:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ImagesIcon</name> <message> <location filename="../WebBrowser/StatusBar/ImagesIcon.py" line="40"/> @@ -32504,6 +32816,7 @@ <source>limited to %n user(s)</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message> @@ -32581,6 +32894,7 @@ <source>{0} sets the channel limit to %n nick(s).</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message> @@ -32823,6 +33137,7 @@ <source>%n day(s)</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message numerus="yes"> @@ -32830,6 +33145,7 @@ <source>%n hour(s)</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message numerus="yes"> @@ -32837,6 +33153,7 @@ <source>%n minute(s)</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message numerus="yes"> @@ -32844,6 +33161,7 @@ <source>%n second(s)</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message> @@ -32869,6 +33187,7 @@ <source>{0} has been idle for %n second(s).</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message> @@ -34601,7 +34920,7 @@ <translation>İlişkilendirilecek alternatif Lexeri seç</translation> </message> <message> - <location filename="../Project/LexerAssociationDialog.py" line="131"/> + <location filename="../Project/LexerAssociationDialog.py" line="134"/> <source>Alternative</source> <translation>Alternatif</translation> </message> @@ -34947,490 +35266,510 @@ <translation>Makefile</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="115"/> + <location filename="../QScintilla/Lexers/__init__.py" line="119"/> <source>Pascal</source> <translation>Pascal</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="117"/> - <source>Perl</source> - <translation>Perl</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="119"/> - <source>PostScript</source> - <translation>PostScript</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="121"/> - <source>Povray</source> - <translation>Povray</translation> + <source>Perl</source> + <translation>Perl</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="123"/> + <source>PostScript</source> + <translation>PostScript</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="125"/> + <source>Povray</source> + <translation>Povray</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="127"/> <source>Properties</source> <translation>Özellikler</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="131"/> - <source>Ruby</source> - <translation>Ruby</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="133"/> - <source>SQL</source> - <translation>SQL</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="135"/> - <source>TCL</source> - <translation>TCL</translation> + <source>Ruby</source> + <translation>Ruby</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="137"/> - <source>TeX</source> - <translation>TeX</translation> + <source>SQL</source> + <translation>SQL</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="139"/> - <source>VHDL</source> - <translation>VHDL</translation> + <source>TCL</source> + <translation>TCL</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="141"/> - <source>XML</source> - <translation>XML</translation> + <source>TeX</source> + <translation>TeX</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="143"/> + <source>VHDL</source> + <translation>VHDL</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="145"/> + <source>XML</source> + <translation>XML</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="147"/> <source>YAML</source> <translation>YAML</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="171"/> + <location filename="../QScintilla/Lexers/__init__.py" line="175"/> <source>Pygments</source> <translation>Pygments</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="365"/> + <location filename="../QScintilla/Lexers/__init__.py" line="375"/> <source>Python Files (*.py *.py2 *.py3)</source> <translation>Python Dosyaları (*.py *.py2 *.py3)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="368"/> + <location filename="../QScintilla/Lexers/__init__.py" line="378"/> <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> <translation>Python GUI Dosyaları (*.pyw *.pyw2 *.pyw3)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="547"/> + <location filename="../QScintilla/Lexers/__init__.py" line="565"/> <source>Pyrex Files (*.pyx)</source> <translation>Pyrex Dosyaları (*.pyx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="550"/> + <location filename="../QScintilla/Lexers/__init__.py" line="568"/> <source>Quixote Template Files (*.ptl)</source> <translation>Quixote Template Dosyaları (*.ptl)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="553"/> + <location filename="../QScintilla/Lexers/__init__.py" line="571"/> <source>Ruby Files (*.rb)</source> <translation>Ruby Dosyaları (*.rb)</translation> </message> <message> + <location filename="../QScintilla/Lexers/__init__.py" line="574"/> + <source>IDL Files (*.idl)</source> + <translation>IDL Dosyaları (*.idl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="393"/> + <source>C Files (*.h *.c)</source> + <translation>C Dosyalır (*.h *.c)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="396"/> + <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> + <translation>C++ Dosyaları (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="586"/> + <source>C# Files (*.cs)</source> + <translation>C# Dosyaları (*.cs)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="402"/> + <source>HTML Files (*.html *.htm *.asp *.shtml)</source> + <translation>HTML Dosyaları (*.html *.htm *.asp *.shtml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="598"/> + <source>CSS Files (*.css)</source> + <translation>CSS Dosyaları (*.css)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="601"/> + <source>QSS Files (*.qss)</source> + <translation>QSS Dosyaları (*.qss)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="411"/> + <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> + <translation>PHP Dosyaları (*.php *.php3 *.php4 *.php5 *.phtml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="414"/> + <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> + <translation>XML Dosyaları (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="613"/> + <source>Qt Resource Files (*.qrc)</source> + <translation>Qt Kaynak Dosyaları (*.qrc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="420"/> + <source>D Files (*.d *.di)</source> + <translation>D Dosyaları (*.d *.di)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="622"/> + <source>Java Files (*.java)</source> + <translation>Java Dosyaları (*.java)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="625"/> + <source>JavaScript Files (*.js)</source> + <translation>JavaScript Dosyaları (*.js)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="628"/> + <source>SQL Files (*.sql)</source> + <translation>SQL Dosyaları (*.sql)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="631"/> + <source>Docbook Files (*.docbook)</source> + <translation>Docbook Dosyaları (*.docbook)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="435"/> + <source>Perl Files (*.pl *.pm *.ph)</source> + <translation>Perl Dosyaları (*.pl *.pm *.ph)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="640"/> + <source>Lua Files (*.lua)</source> + <translation>Lua Dosyaları (*.lua)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="441"/> + <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> + <translation>Tex Dosyaları (*.tex *.sty *.aux *.toc *.idx)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="643"/> + <source>Shell Files (*.sh)</source> + <translation>Kabuk Dosyaları (*.sh)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="447"/> + <source>Batch Files (*.bat *.cmd)</source> + <translation>Batch Dosyaları (*.bat *.cmd)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> + <source>Diff Files (*.diff *.patch)</source> + <translation>Diff Dosyaları (*.diff *.patch)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="453"/> + <source>Makefiles (*.mak)</source> + <translation>Make Dosyaları (*.mak)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="456"/> + <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> + <translation>Ayarlar Dosyaları (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="667"/> + <source>Povray Files (*.pov)</source> + <translation>Povray Dosyaları (*.pov)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="463"/> + <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> + <translation>CMake Dosyaları (CMakeLists.txt *.cmake *.ctest)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="466"/> + <source>VHDL Files (*.vhd *.vhdl)</source> + <translation>VHDL Dosyaları (*.vhd *.vhdl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="469"/> + <source>TCL/Tk Files (*.tcl *.tk)</source> + <translation>TCL/Tk Dosyaları (*.tcl *.tk)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="472"/> + <source>Fortran Files (*.f90 *.f95 *.f2k)</source> + <translation>Fortran Dosyaları (*.f90 *.f95 *.f2k)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="475"/> + <source>Fortran77 Files (*.f *.for)</source> + <translation>Fortran77 Dosyaları (*.f *.for)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="478"/> + <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> + <translation>Pascal Dosyaları (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="694"/> + <source>PostScript Files (*.ps)</source> + <translation>PostScript Dosyaları (*.ps)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="484"/> + <source>YAML Files (*.yaml *.yml)</source> + <translation>YAML Dosyaları (*.yaml *.yml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="744"/> + <source>All Files (*)</source> + <translation>Tüm Dosyalar (*)</translation> + </message> + <message> <location filename="../QScintilla/Lexers/__init__.py" line="556"/> - <source>IDL Files (*.idl)</source> - <translation>IDL Dosyaları (*.idl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="383"/> - <source>C Files (*.h *.c)</source> - <translation>C Dosyalır (*.h *.c)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="386"/> - <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> - <translation>C++ Dosyaları (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="568"/> - <source>C# Files (*.cs)</source> - <translation>C# Dosyaları (*.cs)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="392"/> - <source>HTML Files (*.html *.htm *.asp *.shtml)</source> - <translation>HTML Dosyaları (*.html *.htm *.asp *.shtml)</translation> + <source>Python3 Files (*.py)</source> + <translation>Python Dosyaları (*.py3)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="562"/> + <source>Python3 GUI Files (*.pyw)</source> + <translation>Python GUI Dosyaları (*.pyw3)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="577"/> + <source>C Files (*.c)</source> + <translation>C Dosyaları (*.c)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="580"/> - <source>CSS Files (*.css)</source> - <translation>CSS Dosyaları (*.css)</translation> + <source>C++ Files (*.cpp)</source> + <translation>C++ Dosyaları (*.cpp)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="583"/> - <source>QSS Files (*.qss)</source> - <translation>QSS Dosyaları (*.qss)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="401"/> - <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> - <translation>PHP Dosyaları (*.php *.php3 *.php4 *.php5 *.phtml)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="404"/> - <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> - <translation>XML Dosyaları (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation> + <source>C++/C Header Files (*.h)</source> + <translation>C++/C Yardımcı Dosyaları (*.h)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="589"/> + <source>HTML Files (*.html)</source> + <translation>HTML Dosyaları (*.html)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="592"/> + <source>PHP Files (*.php)</source> + <translation>PHP Dosyaları (*.php)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="595"/> - <source>Qt Resource Files (*.qrc)</source> - <translation>Qt Kaynak Dosyaları (*.qrc)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="410"/> - <source>D Files (*.d *.di)</source> - <translation>D Dosyaları (*.d *.di)</translation> + <source>ASP Files (*.asp)</source> + <translation>ASP Dosyaları (*.asp)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="604"/> - <source>Java Files (*.java)</source> - <translation>Java Dosyaları (*.java)</translation> + <source>XML Files (*.xml)</source> + <translation>XML Dosyaları (*.xml)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="607"/> - <source>JavaScript Files (*.js)</source> - <translation>JavaScript Dosyaları (*.js)</translation> + <source>XSL Files (*.xsl)</source> + <translation>XSL Dosyaları (*.xsl)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="610"/> - <source>SQL Files (*.sql)</source> - <translation>SQL Dosyaları (*.sql)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="613"/> - <source>Docbook Files (*.docbook)</source> - <translation>Docbook Dosyaları (*.docbook)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="425"/> - <source>Perl Files (*.pl *.pm *.ph)</source> - <translation>Perl Dosyaları (*.pl *.pm *.ph)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="622"/> - <source>Lua Files (*.lua)</source> - <translation>Lua Dosyaları (*.lua)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="431"/> - <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> - <translation>Tex Dosyaları (*.tex *.sty *.aux *.toc *.idx)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="625"/> - <source>Shell Files (*.sh)</source> - <translation>Kabuk Dosyaları (*.sh)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="437"/> - <source>Batch Files (*.bat *.cmd)</source> - <translation>Batch Dosyaları (*.bat *.cmd)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="440"/> - <source>Diff Files (*.diff *.patch)</source> - <translation>Diff Dosyaları (*.diff *.patch)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="443"/> - <source>Makefiles (*.mak)</source> - <translation>Make Dosyaları (*.mak)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="446"/> - <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> - <translation>Ayarlar Dosyaları (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> + <source>DTD Files (*.dtd)</source> + <translation>DTD Dosyaları (*.dtd)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="616"/> + <source>D Files (*.d)</source> + <translation>D Dosyaları (*.d)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="619"/> + <source>D Interface Files (*.di)</source> + <translation>D Interface Dosyaları (*.di)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="634"/> + <source>Perl Files (*.pl)</source> + <translation>Perl Dosyaları (*.pl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="637"/> + <source>Perl Module Files (*.pm)</source> + <translation>Perl Module Dosyaları (*.pm)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="646"/> + <source>Batch Files (*.bat)</source> + <translation>Batch Dosyaları (*.bat)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="649"/> - <source>Povray Files (*.pov)</source> - <translation>Povray Dosyaları (*.pov)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="453"/> - <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> - <translation>CMake Dosyaları (CMakeLists.txt *.cmake *.ctest)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="456"/> - <source>VHDL Files (*.vhd *.vhdl)</source> - <translation>VHDL Dosyaları (*.vhd *.vhdl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="459"/> - <source>TCL/Tk Files (*.tcl *.tk)</source> - <translation>TCL/Tk Dosyaları (*.tcl *.tk)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="462"/> - <source>Fortran Files (*.f90 *.f95 *.f2k)</source> - <translation>Fortran Dosyaları (*.f90 *.f95 *.f2k)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="465"/> - <source>Fortran77 Files (*.f *.for)</source> - <translation>Fortran77 Dosyaları (*.f *.for)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="468"/> - <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> - <translation>Pascal Dosyaları (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</translation> + <source>TeX Files (*.tex)</source> + <translation>TeX Dosyaları (*.tex)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="652"/> + <source>TeX Template Files (*.sty)</source> + <translation>TeXŞablon Dosyası (*.sty)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="655"/> + <source>Diff Files (*.diff)</source> + <translation>Diff Dosyaları (*.diff)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="658"/> + <source>Make Files (*.mak)</source> + <translation>Make Dosyaları (*.mak)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="661"/> + <source>Properties Files (*.ini)</source> + <translation>Özellikler Dosyaları (*.ini)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="664"/> + <source>Configuration Files (*.cfg)</source> + <translation>Ayar Dosyaları (*.cfg)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="670"/> + <source>CMake Files (CMakeLists.txt)</source> + <translation>CMake Dosyaları (CMakeLists.txt)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="673"/> + <source>CMake Macro Files (*.cmake)</source> + <translation>CMake Makro Dosyaları (*.cmake)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="676"/> - <source>PostScript Files (*.ps)</source> - <translation>PostScript Dosyaları (*.ps)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="474"/> - <source>YAML Files (*.yaml *.yml)</source> - <translation>YAML Dosyaları (*.yaml *.yml)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="718"/> - <source>All Files (*)</source> - <translation>Tüm Dosyalar (*)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="538"/> - <source>Python3 Files (*.py)</source> - <translation>Python Dosyaları (*.py3)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="544"/> - <source>Python3 GUI Files (*.pyw)</source> - <translation>Python GUI Dosyaları (*.pyw3)</translation> + <source>VHDL Files (*.vhd)</source> + <translation>VHDL Dosyaları (*.vhd)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="679"/> + <source>TCL Files (*.tcl)</source> + <translation>TCL Dosyaları (*.tcl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="682"/> + <source>Tk Files (*.tk)</source> + <translation>Tk Dosyaları (*.tk)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="685"/> + <source>Fortran Files (*.f95)</source> + <translation>Fortran Dosyaları (*.f95)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="688"/> + <source>Fortran77 Files (*.f)</source> + <translation>Fortran77 Dosyaları (*.f)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="691"/> + <source>Pascal Files (*.pas)</source> + <translation>Pascal Dosyaları (*.pas)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="697"/> + <source>YAML Files (*.yml)</source> + <translation>YAML Dosyaları (*.yml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="129"/> + <source>Python2</source> + <translation>Python2</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="131"/> + <source>Python3</source> + <translation>Python3</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="553"/> + <source>Python2 Files (*.py2)</source> + <translation>Python2 Dosyaları (*.py2)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="559"/> - <source>C Files (*.c)</source> - <translation>C Dosyaları (*.c)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="562"/> - <source>C++ Files (*.cpp)</source> - <translation>C++ Dosyaları (*.cpp)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="565"/> - <source>C++/C Header Files (*.h)</source> - <translation>C++/C Yardımcı Dosyaları (*.h)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="571"/> - <source>HTML Files (*.html)</source> - <translation>HTML Dosyaları (*.html)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="574"/> - <source>PHP Files (*.php)</source> - <translation>PHP Dosyaları (*.php)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="577"/> - <source>ASP Files (*.asp)</source> - <translation>ASP Dosyaları (*.asp)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="586"/> - <source>XML Files (*.xml)</source> - <translation>XML Dosyaları (*.xml)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="589"/> - <source>XSL Files (*.xsl)</source> - <translation>XSL Dosyaları (*.xsl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="592"/> - <source>DTD Files (*.dtd)</source> - <translation>DTD Dosyaları (*.dtd)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="598"/> - <source>D Files (*.d)</source> - <translation>D Dosyaları (*.d)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="601"/> - <source>D Interface Files (*.di)</source> - <translation>D Interface Dosyaları (*.di)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="616"/> - <source>Perl Files (*.pl)</source> - <translation>Perl Dosyaları (*.pl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="619"/> - <source>Perl Module Files (*.pm)</source> - <translation>Perl Module Dosyaları (*.pm)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="628"/> - <source>Batch Files (*.bat)</source> - <translation>Batch Dosyaları (*.bat)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="631"/> - <source>TeX Files (*.tex)</source> - <translation>TeX Dosyaları (*.tex)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="634"/> - <source>TeX Template Files (*.sty)</source> - <translation>TeXŞablon Dosyası (*.sty)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="637"/> - <source>Diff Files (*.diff)</source> - <translation>Diff Dosyaları (*.diff)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="640"/> - <source>Make Files (*.mak)</source> - <translation>Make Dosyaları (*.mak)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="643"/> - <source>Properties Files (*.ini)</source> - <translation>Özellikler Dosyaları (*.ini)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="646"/> - <source>Configuration Files (*.cfg)</source> - <translation>Ayar Dosyaları (*.cfg)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="652"/> - <source>CMake Files (CMakeLists.txt)</source> - <translation>CMake Dosyaları (CMakeLists.txt)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="655"/> - <source>CMake Macro Files (*.cmake)</source> - <translation>CMake Makro Dosyaları (*.cmake)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="658"/> - <source>VHDL Files (*.vhd)</source> - <translation>VHDL Dosyaları (*.vhd)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="661"/> - <source>TCL Files (*.tcl)</source> - <translation>TCL Dosyaları (*.tcl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="664"/> - <source>Tk Files (*.tk)</source> - <translation>Tk Dosyaları (*.tk)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="667"/> - <source>Fortran Files (*.f95)</source> - <translation>Fortran Dosyaları (*.f95)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="670"/> - <source>Fortran77 Files (*.f)</source> - <translation>Fortran77 Dosyaları (*.f)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="673"/> - <source>Pascal Files (*.pas)</source> - <translation>Pascal Dosyaları (*.pas)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="679"/> - <source>YAML Files (*.yml)</source> - <translation>YAML Dosyaları (*.yml)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="125"/> - <source>Python2</source> - <translation>Python2</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="127"/> - <source>Python3</source> - <translation>Python3</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="535"/> - <source>Python2 Files (*.py2)</source> - <translation>Python2 Dosyaları (*.py2)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="541"/> <source>Python2 GUI Files (*.pyw2)</source> <translation>Python2 GUI Dosyaları (*.pyw2)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="148"/> + <location filename="../QScintilla/Lexers/__init__.py" line="115"/> <source>Matlab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="148"/> + <location filename="../QScintilla/Lexers/__init__.py" line="117"/> <source>Octave</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="480"/> + <location filename="../QScintilla/Lexers/__init__.py" line="487"/> <source>Matlab Files (*.m *.m.matlab)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="685"/> + <location filename="../QScintilla/Lexers/__init__.py" line="700"/> <source>Matlab Files (*.m)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="685"/> + <location filename="../QScintilla/Lexers/__init__.py" line="703"/> <source>Octave Files (*.m.octave)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="480"/> + <location filename="../QScintilla/Lexers/__init__.py" line="490"/> <source>Octave Files (*.m *.m.octave)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="129"/> + <location filename="../QScintilla/Lexers/__init__.py" line="133"/> <source>QSS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="157"/> + <location filename="../QScintilla/Lexers/__init__.py" line="153"/> <source>Gettext</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="695"/> + <location filename="../QScintilla/Lexers/__init__.py" line="709"/> <source>Gettext Files (*.po)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="162"/> + <location filename="../QScintilla/Lexers/__init__.py" line="158"/> <source>CoffeeScript</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="702"/> + <location filename="../QScintilla/Lexers/__init__.py" line="716"/> <source>CoffeeScript Files (*.coffee)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="163"/> + <source>JSON</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="723"/> + <source>JSON Files (*.json)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="166"/> + <source>Markdown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="728"/> + <source>Markdown Files (*.md)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>LfConvertDataDialog</name> @@ -35643,6 +35982,19 @@ </message> </context> <context> + <name>MarkdownProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/MarkdownProvider.py" line="383"/> + <source>Create List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/MarkdownProvider.py" line="383"/> + <source>Enter desired number of list elements:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>MasterPasswordEntryDialog</name> <message> <location filename="../Preferences/ConfigurationPages/MasterPasswordEntryDialog.ui" line="14"/> @@ -35718,12 +36070,12 @@ <context> <name>McCabeChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="423"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="426"/> <source>'{0}' is too complex ({1})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="425"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="428"/> <source>{0}: {1}</source> <translation type="unfinished"></translation> </message> @@ -35751,124 +36103,114 @@ <translation>Gösterilecek kayıt mesajlarının sayısını girin</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="155"/> <source>Commit</source> <translation>Teslimat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="161"/> <source>No. of commit messages to remember:</source> <translation>Teslim etmek için hatırlanacak mesaj sayısı:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="168"/> <source>Enter the number of commit messages to remember</source> <translation>Teslim edilmek için hatırlanacak mesj sayısını girin</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="236"/> <source>Incoming / Outgoing</source> - <translation>Giren / Çıkan</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="222"/> - <source>Select to show the incoming and outgoing log in a log browser dialog</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="225"/> - <source>Use Log Browser for incoming / outgoing log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="235"/> + <translation type="obsolete">Giren / Çıkan</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="242"/> + <source>Select to update the working directory to new tip</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="236"/> <source>Pull</source> <translation>Çekmek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="241"/> - <source>Select to update the working directory to new tip</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="245"/> <source>Update after pulling</source> <translation>Çekerken güncelle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="334"/> <source>Edit the Mercurial configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="337"/> <source>Edit configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="311"/> <source>Cleanup</source> <translation type="unfinished">Temizle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="317"/> <source>Pattern:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="324"/> <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="252"/> <source>Select to prefer unbundle over pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="255"/> <source><b>Prefer Unbundle</b> <p>If this option is selected, it will be checked, if a Mercurial changegroups file from a previous "Show Incoming" request exists. In this case it will be applied and deleted. Otherwise a pull request will be sent.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="259"/> <source>Prefer Unbundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="292"/> <source>Revert</source> <translation type="unfinished">Başa Dönme</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="298"/> <source>Select to create a backup file (.orig) before reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="301"/> <source>Create Backup Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="269"/> <source>Merge</source> <translation type="unfinished">Birleştir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="275"/> <source>Select to enforce usage of the Mercural internal merge tool</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="278"/> <source><b>Internal Merge Tool</b> <p>Select to enforce usage of the Mercural internal merge tool,which leaves conflict markers in the file in case of conflicting changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="282"/> <source>Use internal merge with conflict markers</source> <translation type="unfinished"></translation> </message> @@ -35903,15 +36245,25 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="197"/> <source>No. of commit authors to remember:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="204"/> <source>Enter the number of commit authors to remember</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="132"/> + <source>No. of message characters shown in list:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="139"/> + <source>Enter the number of characters of the commit message to be shown in the list</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -36870,107 +37222,107 @@ <context> <name>MiscellaneousChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="429"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="432"/> <source>coding magic comment not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="432"/> - <source>unknown encoding ({0}) found in coding magic comment</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="435"/> - <source>copyright notice not present</source> + <source>unknown encoding ({0}) found in coding magic comment</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="438"/> - <source>copyright notice contains invalid author</source> + <source>copyright notice not present</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="441"/> - <source>blind except: statement</source> + <source>copyright notice contains invalid author</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="444"/> - <source>found {0} formatter</source> + <source>blind except: statement</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="447"/> - <source>format string does contain unindexed parameters</source> + <source>found {0} formatter</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="450"/> - <source>docstring does contain unindexed parameters</source> + <source>format string does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="453"/> - <source>other string does contain unindexed parameters</source> + <source>docstring does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="456"/> - <source>format call uses too large index ({0})</source> + <source>other string does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="459"/> - <source>format call uses missing keyword ({0})</source> + <source>format call uses too large index ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="462"/> - <source>format call uses keyword arguments but no named entries</source> + <source>format call uses missing keyword ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="465"/> - <source>format call uses variable arguments but no numbered entries</source> + <source>format call uses keyword arguments but no named entries</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="468"/> - <source>format call uses implicit and explicit indexes together</source> + <source>format call uses variable arguments but no numbered entries</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="471"/> - <source>format call provides unused index ({0})</source> + <source>format call uses implicit and explicit indexes together</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="474"/> - <source>format call provides unused keyword ({0})</source> + <source>format call provides unused index ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="477"/> - <source>expected these __future__ imports: {0}; but only got: {1}</source> + <source>format call provides unused keyword ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="480"/> - <source>expected these __future__ imports: {0}; but got none</source> + <source>expected these __future__ imports: {0}; but only got: {1}</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="483"/> - <source>print statement found</source> + <source>expected these __future__ imports: {0}; but got none</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="486"/> - <source>one element tuple found</source> + <source>print statement found</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="489"/> + <source>one element tuple found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="492"/> <source>{0}: {1}</source> <translation type="unfinished"></translation> </message> @@ -37363,72 +37715,72 @@ <context> <name>NamingStyleChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="378"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> <source>class names should use CapWords convention</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> - <source>function name should be lowercase</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="384"/> - <source>argument name should be lowercase</source> + <source>function name should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="387"/> - <source>first argument of a class method should be named 'cls'</source> + <source>argument name should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="390"/> - <source>first argument of a method should be named 'self'</source> + <source>first argument of a class method should be named 'cls'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="393"/> + <source>first argument of a method should be named 'self'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="396"/> <source>first argument of a static method should not be named 'self' or 'cls</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="397"/> - <source>module names should be lowercase</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="400"/> - <source>package names should be lowercase</source> + <source>module names should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="403"/> - <source>constant imported as non constant</source> + <source>package names should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="406"/> - <source>lowercase imported as non lowercase</source> + <source>constant imported as non constant</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="409"/> - <source>camelcase imported as lowercase</source> + <source>lowercase imported as non lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="412"/> - <source>camelcase imported as constant</source> + <source>camelcase imported as lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="415"/> - <source>variable in function should be lowercase</source> + <source>camelcase imported as constant</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="418"/> + <source>variable in function should be lowercase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="421"/> <source>names 'l', 'O' and 'I' should be avoided</source> <translation type="unfinished"></translation> </message> @@ -39826,27 +40178,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1525"/> + <location filename="../Preferences/__init__.py" line="1530"/> <source>Export Preferences</source> <translation>Seçenekleri Dışa Aktar</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1553"/> + <location filename="../Preferences/__init__.py" line="1558"/> <source>Import Preferences</source> <translation>Seçenekleri İçe Aktar</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1553"/> + <location filename="../Preferences/__init__.py" line="1558"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1655"/> + <location filename="../Preferences/__init__.py" line="1660"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1655"/> + <location filename="../Preferences/__init__.py" line="1660"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -39872,7 +40224,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="572"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="565"/> <source><p>ReStructuredText preview requires the <b>python-docutils</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pypi.python.org/pypi/docutils">this page.</a></p></source> <translation type="unfinished"></translation> </message> @@ -39882,8 +40234,8 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="597"/> - <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> + <location filename="../UI/Previewers/PreviewerHTML.py" line="590"/> + <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> <translation type="unfinished"></translation> </message> </context> @@ -39910,17 +40262,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="177"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="179"/> <source><p>No preview available for this type of file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="225"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="230"/> <source>Preview - {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="227"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="232"/> <source>Preview</source> <translation type="unfinished"></translation> </message> @@ -40628,6 +40980,7 @@ <source>The project contains %n file(s) with syntax errors.</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message> @@ -43544,6 +43897,7 @@ <source>%n file(s) could not be parsed. Coverage info for these is not available.</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message> @@ -44469,521 +44823,501 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/> - <source>Show log</source> - <translation type="unfinished">Kayıtı göster</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/> - <source>Show &log</source> - <translation type="unfinished">Kayıtı &göster</translation> + <source>Show log browser</source> + <translation type="unfinished">Kayıt gözatıcısını gösted</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> - <source>Show the log of the local project</source> - <translation type="unfinished">Yerel projenin günlük kaydını göster</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="107"/> - <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="114"/> - <source>Show log browser</source> - <translation type="unfinished">Kayıt gözatıcısını gösted</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="119"/> - <source>Show a dialog to browse the log of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/> <source>Show &difference</source> <translation type="unfinished">Farkları gös&ter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="132"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="137"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="140"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/> <source>Show differences (URLs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="153"/> <source>Show the difference of the project between two repository URLs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="156"/> <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/> + <source>Show status</source> + <translation type="unfinished">Durumu Göster</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/> + <source>Show &status</source> + <translation type="unfinished">Durumu gö&ster</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> + <source>Show the status of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="172"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> - <source>Show status</source> - <translation type="unfinished">Durumu Göster</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> - <source>Show &status</source> - <translation type="unfinished">Durumu gö&ster</translation> + <source>Show change lists</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/> - <source>Show the status of the local project</source> + <source>Show the change lists and associated files of the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="187"/> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> - <source>Show change lists</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="199"/> - <source>Show the change lists and associated files of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="202"/> <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> <source>Show repository info</source> <translation type="unfinished">Kaynak havuzu bilgisini göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="215"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="200"/> <source>Show some repository related information for the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="203"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source>Tag in repository</source> + <translation type="unfinished">Kaynak havuzu etiketi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source>&Tag in repository...</source> + <translation type="unfinished">Kaynak havuzu e&tiketi...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="216"/> + <source>Tag the local project in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> - <source>Tag in repository</source> - <translation type="unfinished">Kaynak havuzu etiketi</translation> + <source>Export from repository</source> + <translation type="unfinished">Kaynak havuzundan ihraç et</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> - <source>&Tag in repository...</source> - <translation type="unfinished">Kaynak havuzu e&tiketi...</translation> + <source>&Export from repository...</source> + <translation type="unfinished">Dışarı kaynak havuzundan ihraç &et...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="231"/> - <source>Tag the local project in the repository</source> - <translation type="unfinished"></translation> + <source>Export a project from the repository</source> + <translation type="unfinished">Dışa Kaynak havuzundan proje aktar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished"></translation> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation type="unfinished"><b>Kaynak havuzundan dışa aktar</b><p>Bu kaynak havuzundan bir projeyi dışa aktarır.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> - <source>Export from repository</source> - <translation type="unfinished">Kaynak havuzundan ihraç et</translation> + <source>Command options</source> + <translation type="unfinished">Komut seçenekleri</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> - <source>&Export from repository...</source> - <translation type="unfinished">Dışarı kaynak havuzundan ihraç &et...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="246"/> - <source>Export a project from the repository</source> - <translation type="unfinished">Dışa Kaynak havuzundan proje aktar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation type="unfinished"><b>Kaynak havuzundan dışa aktar</b><p>Bu kaynak havuzundan bir projeyi dışa aktarır.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/> - <source>Command options</source> - <translation type="unfinished">Komut seçenekleri</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/> <source>Command &options...</source> <translation type="unfinished">K&omut seçenekleri...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Show the VCS command options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/> + <source>Revert changes</source> + <translation type="unfinished">Değişiklikleri başa döndür</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/> + <source>Re&vert changes</source> + <translation type="unfinished">Değişiklikleri ba&şa döndür</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <source>Revert all changes made to the local project</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/> - <source>Revert changes</source> - <translation type="unfinished">Değişiklikleri başa döndür</translation> + <source>Merge</source> + <translation type="unfinished">Birleştir</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/> - <source>Re&vert changes</source> - <translation type="unfinished">Değişiklikleri ba&şa döndür</translation> + <source>Mer&ge changes...</source> + <translation type="unfinished">De&ğişiklikleri birleştir...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> - <source>Revert all changes made to the local project</source> + <source>Merge changes of a tag/revision into the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/> - <source>Merge</source> - <translation type="unfinished">Birleştir</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/> - <source>Mer&ge changes...</source> - <translation type="unfinished">De&ğişiklikleri birleştir...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="289"/> - <source>Merge changes of a tag/revision into the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/> + <source>Switch</source> + <translation type="unfinished">Değiştirmek</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/> + <source>S&witch...</source> + <translation type="unfinished">Deği&ştirmek...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <source>Switch the local copy to another tag/branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>Switch</source> - <translation type="unfinished">Değiştirmek</translation> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>S&witch...</source> - <translation type="unfinished">Deği&ştirmek...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> - <source>Switch the local copy to another tag/branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> - <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="304"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="307"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> + <source>Cleanup</source> + <translation type="unfinished">Temizle</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> + <source>Cleanu&p</source> + <translation type="unfinished">Temi&zle</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished"></translation> + <source>Cleanup the local project</source> + <translation type="unfinished">Yerel projeyi temizle</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="322"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/> - <source>Cleanup</source> - <translation type="unfinished">Temizle</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/> - <source>Cleanu&p</source> - <translation type="unfinished">Temi&zle</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> - <source>Cleanup the local project</source> - <translation type="unfinished">Yerel projeyi temizle</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="337"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation type="unfinished"><b>Temizle</b><p>Bu yerel projeyi sıfırlar.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>Execute command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>E&xecute command...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="333"/> <source>Execute an arbitrary VCS command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="336"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/> <source>List tags</source> <translation type="unfinished">Etiketleri listele</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/> <source>List tags...</source> <translation type="unfinished">Etiketleri listele...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="350"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches</source> <translation type="unfinished">Branşlar listesi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches...</source> <translation type="unfinished">Branşlar listesi...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="361"/> <source>List branches of the project</source> <translation type="unfinished">Prosenin branşlar listesi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="364"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation type="unfinished"><b>Branş listesi</b><p>Bu listeler prosenin branş listeleridir.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source>List repository contents</source> <translation type="unfinished">Kaynak Havuzu içeriğini listele</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source>List repository contents...</source> <translation type="unfinished">Kaynak Havuzu içeriğini listele...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="375"/> <source>Lists the contents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/> <source>Set Property</source> <translation type="unfinished">Özellikleri Ayarla</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/> <source>Set Property...</source> <translation type="unfinished">Özellikleri Ayarla...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="389"/> <source>Set a property for the project files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="392"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source>List Properties</source> <translation type="unfinished">Özellikleri Listele</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source>List Properties...</source> <translation type="unfinished">Özellikler Listeleniyor...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="403"/> <source>List properties of the project files</source> <translation type="unfinished">Proje dosyalarının özelliklerin listele</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/> <source>Delete Property</source> <translation type="unfinished">Özellikleri Sil</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/> <source>Delete Property...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> + <source>Delete a property for the project files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="420"/> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/> + <source>Relocate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/> + <source>Relocate...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> - <source>Delete a property for the project files</source> + <source>Relocate the working copy to a new repository URL</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/> - <source>Relocate</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/> - <source>Relocate...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> - <source>Relocate the working copy to a new repository URL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/> + <source>Repository Browser</source> + <translation type="unfinished">Kaynak Havuzu Gözatıcısı</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/> + <source>Repository Browser...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> + <source>Show the Repository Browser dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> - <source>Repository Browser</source> - <translation type="unfinished">Kaynak Havuzu Gözatıcısı</translation> + <source>Configure</source> + <translation type="unfinished">Yapılandırma</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> - <source>Repository Browser...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="463"/> - <source>Show the Repository Browser dialog</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="466"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <source>Configure...</source> + <translation type="unfinished">Ayarlanıyor...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="462"/> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="465"/> + <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/> - <source>Configure</source> - <translation type="unfinished">Yapılandırma</translation> + <source>Upgrade</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/> - <source>Configure...</source> - <translation type="unfinished">Ayarlanıyor...</translation> + <source>Upgrade...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="477"/> - <source>Show the configuration dialog with the Subversion page selected</source> + <source>Upgrade the working copy to the current format</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="480"/> - <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/> - <source>Upgrade</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/> - <source>Upgrade...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="492"/> - <source>Upgrade the working copy to the current format</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="495"/> <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="559"/> <source>Subversion (pysvn)</source> <translation type="unfinished">Altsürüm (pysvn)</translation> </message> @@ -47967,17 +48301,17 @@ <translation>Ekle...</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="55"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="65"/> <source>Press to remove the selected documents from the database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="58"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="68"/> <source>Remove</source> <translation>Kaldır</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="117"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="132"/> <source>Add Documentation</source> <translation>Belgelere Ekle</translation> </message> @@ -47987,40 +48321,50 @@ <translation>Sıkıştırılmış Qt Yardım Dosyaları (*.qch)</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="107"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="122"/> <source>The file <b>{0}</b> is not a valid Qt Help File.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="117"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="132"/> <source>The namespace <b>{0}</b> is already registered.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="167"/> + <source>Remove Documentation</source> + <translation>Belgelerden Kaldır</translation> + </message> + <message> <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="152"/> - <source>Remove Documentation</source> - <translation>Belgelerden Kaldır</translation> - </message> - <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="137"/> <source>Do you really want to remove the selected documentation sets from the database?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="152"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="167"/> <source>Some documents currently opened reference the documentation you are attempting to remove. Removing the documentation will close those documents. Remove anyway?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="78"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="55"/> <source>Press to select QtHelp documents provided by a plug-in to add to the database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="81"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="58"/> <source>Add from Plug-ins...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="85"/> + <source>Select to manage the plug-in provided documentation sets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="88"/> + <source>Manage Plug-ins...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QtHelpDocumentationSelectionDialog</name> @@ -48034,6 +48378,61 @@ <source>Select the documentation files to be installed:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="144"/> + <source>Delete Documentation Sets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="91"/> + <source>Shall the selected documentation sets really be deleted?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="107"/> + <source><p>The documentation set <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="126"/> + <source>Shall the selected documentation set categories really be deleted?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="144"/> + <source>Shall all documentation sets really be deleted?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="56"/> + <source>Press to delete the selected documentation sets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="59"/> + <source>Delete</source> + <translation type="unfinished">Sil</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="66"/> + <source>Press to delete the selected category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="69"/> + <source>Delete Categories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="76"/> + <source>Press to delete all entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="79"/> + <source>Delete All</source> + <translation type="unfinished">Hepsini Sil</translation> + </message> </context> <context> <name>QtHelpFiltersDialog</name> @@ -49306,6 +49705,19 @@ </message> </context> <context> + <name>RestructuredTextProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/RestructuredTextProvider.py" line="411"/> + <source>Create List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/RestructuredTextProvider.py" line="411"/> + <source>Enter desired number of list elements:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>SafariImporter</name> <message> <location filename="../WebBrowser/Bookmarks/BookmarksImporters/SafariImporter.py" line="44"/> @@ -50798,6 +51210,7 @@ <source>Snapshot will be taken in %n seconds</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> </context> @@ -52405,7 +52818,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1984"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1964"/> <source>The svn process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -52495,137 +52908,137 @@ <translation>Taşınıyor {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/> <source>Subversion Error</source> <translation>Altsürüm Hatası</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="951"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="998"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="978"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1033"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1013"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1056"/> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1093"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1073"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1151"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1131"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1196"/> <source>Merging {0}</source> <translation>Birleştiriliyor {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1482"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1462"/> <source>Cleaning up {0}</source> <translation>Temizle {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1512"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1492"/> <source>Subversion command</source> <translation>Altsürüm komutu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1684"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1664"/> <source>Resolving conficts</source> <translation>Çelişki çözümleniyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1695"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1779"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1759"/> <source>Subversion Set Property</source> <translation>Altsürüm Özelliklerini Ayarla</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1781"/> + <source>You have to supply a property name. Aborting.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1801"/> - <source>You have to supply a property name. Aborting.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1821"/> <source>Subversion Delete Property</source> <translation>Altsürüm Silme Önceliği</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1791"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1771"/> <source>Enter property name</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> <source>Subversion Log</source> - <translation>Altsürüm Kayıtı</translation> + <translation type="obsolete">Altsürüm Kayıtı</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> <source>Select number of entries to show.</source> - <translation>Gösterilecek giriş sayısını seçiniz.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2100"/> + <translation type="obsolete">Gösterilecek giriş sayısını seçiniz.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2080"/> <source>Locking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2108"/> <source>Unlocking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2153"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2133"/> <source>Relocating</source> <translation>Yeniden konumlandırılıyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/> <source>Repository Browser</source> <translation>Kaynak Havuzu Gözatıcısı</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/> <source>Enter the repository URL.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2221"/> <source>Remove from changelist</source> <translation>Değişiklik listesinden çıkar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/> <source>Add to changelist</source> <translation>Değişiklik listesine ekle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/> <source>Enter name of the changelist:</source> <translation>Değişiklik listesi adını giriniz:</translation> </message> @@ -52641,29 +53054,29 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1255"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1234"/> <source>Revision {0}. </source> <translation>Gözden geçirme {0}. </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1923"/> <source>Property set.</source> <translation>Özellikleri Ayarla.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1997"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1976"/> <source>Property deleted.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/> <source>Subversion Lock</source> <translation>Altsürüm Kilidi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/> <source>Enter lock comment</source> <translation type="unfinished"></translation> </message> @@ -52843,37 +53256,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/> <source>Revert changes</source> <translation type="unfinished">Değişiklikleri başa döndür</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1042"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1987"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1967"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/> <source>Subversion Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Dosya <b>{0}</b> okunamıyor.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2305"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2285"/> <source>Upgrade</source> <translation type="unfinished"></translation> </message> @@ -53761,17 +54174,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="661"/> <source>Revision</source> <translation>Gözden Geçirme</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="658"/> <source>Author</source> <translation>Yazar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="165"/> <source>Message</source> <translation>Mesaj</translation> </message> @@ -53831,256 +54244,251 @@ <translation>Kopyalama/Taşımıyı Durdur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="261"/> <source>Press to generate a diff to the previous revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="264"/> <source>&Diff to Previous</source> <translation>Öncekin&den Farklılıklar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="271"/> <source>Press to compare two revisions</source> <translation>İki düzenlemeyi karşılaştırmak için basınız</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> <source>&Compare Revisions</source> <translation>Gözden Geçirmeleri Karşılaş&tır</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="312"/> <source>Errors</source> <translation>Hatalar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="318"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="334"/> <source>Input</source> <translation>Girdi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="336"/> - <source>Press to send the input to the subversion process</source> - <translation>Girdiyi altsürüm sürecine göndermek için basınız</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/> - <source>&Send</source> - <translation>&Gönder</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="349"/> - <source>Enter data to be sent to the subversion process</source> - <translation>Altsürüm işlemleri için gönderilecek verileri gir</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> - <source>Select to switch the input field to password mode</source> - <translation>Giriş alanını parola moduna çevirmek için seçiniz</translation> + <source>Press to send the input to the subversion process</source> + <translation>Girdiyi altsürüm sürecine göndermek için basınız</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> - <source>&Password Mode</source> - <translation>&Parola Modu</translation> + <source>&Send</source> + <translation>&Gönder</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="369"/> + <source>Enter data to be sent to the subversion process</source> + <translation>Altsürüm işlemleri için gönderilecek verileri gir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="376"/> + <source>Select to switch the input field to password mode</source> + <translation>Giriş alanını parola moduna çevirmek için seçiniz</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="379"/> + <source>&Password Mode</source> + <translation>&Parola Modu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="382"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="89"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="93"/> <source>Added</source> <translation>Eklendi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="90"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="94"/> <source>Deleted</source> <translation>Silindi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="91"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="95"/> <source>Modified</source> <translation>Değiştirildi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="504"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="527"/> <source>Subversion Error</source> <translation>Altsürüm Hatası</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="313"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="313"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="96"/> <source>Replaced</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="294"/> <source>Select to show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="297"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnLogDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="14"/> <source>Subversion Log</source> - <translation>Altsürüm Kayıtı</translation> + <translation type="obsolete">Altsürüm Kayıtı</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="26"/> <source>Log</source> - <translation>Günlük</translation> + <translation type="obsolete">Günlük</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="32"/> <source><b>Subversion Log</b><p>This shows the output of the svn log command. By clicking on the links you may show the difference between versions.</p></source> - <translation><b>Altsürüm Günlüğü</b><p>Bu svn günlük komutlarının çıktısını gösterir.Bağlantıların üzerine tıklanması durumunda sürümler arasındaki farkları gösterir.</p></translation> + <translation type="obsolete"><b>Altsürüm Günlüğü</b><p>Bu svn günlük komutlarının çıktısını gösterir.Bağlantıların üzerine tıklanması durumunda sürümler arasındaki farkları gösterir.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="58"/> <source>Errors</source> - <translation>Hatalar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="64"/> - <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> - <translation></translation> + <translation type="obsolete">Hatalar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="80"/> <source>Input</source> - <translation>Girdi</translation> + <translation type="obsolete">Girdi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="102"/> <source>Press to send the input to the subversion process</source> - <translation>Girdiyi altsürüm sürecine göndermek için basınız</translation> + <translation type="obsolete">Girdiyi altsürüm sürecine göndermek için basınız</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="105"/> <source>&Send</source> - <translation>&Gönder</translation> + <translation type="obsolete">&Gönder</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="108"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="115"/> <source>Enter data to be sent to the subversion process</source> - <translation>Altsürüm işlemleri için gönderilecek verileri gir</translation> + <translation type="obsolete">Altsürüm işlemleri için gönderilecek verileri gir</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="122"/> <source>Select to switch the input field to password mode</source> - <translation>Giriş alanını parola moduna çevirmek için seçiniz</translation> + <translation type="obsolete">Giriş alanını parola moduna çevirmek için seçiniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="125"/> <source>&Password Mode</source> - <translation>&Parola Modu</translation> + <translation type="obsolete">&Parola Modu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="128"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="55"/> <source><b>Processing your request, please wait...</b></source> - <translation><b>İsteğiniz yerine getirilyor, lütfen bekleyiniz...</b></translation> + <translation type="obsolete"><b>İsteğiniz yerine getirilyor, lütfen bekleyiniz...</b></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="81"/> <source>Added</source> - <translation>Eklendi</translation> + <translation type="obsolete">Eklendi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="82"/> <source>Deleted</source> - <translation>Silindi</translation> + <translation type="obsolete">Silindi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="83"/> <source>Modified</source> - <translation>Değiştirildi</translation> + <translation type="obsolete">Değiştirildi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="87"/> <source>revision</source> - <translation>gözden geçirme</translation> + <translation type="obsolete">gözden geçirme</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> <source>Process Generation Error</source> - <translation>İşlem Üretecinde Hata</translation> + <translation type="obsolete">İşlem Üretecinde Hata</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> + <translation type="obsolete">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="193"/> <source>diff to {0}</source> - <translation>{0}ne farkı</translation> + <translation type="obsolete">{0}ne farkı</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="202"/> <source><i>author: {0}</i><br /> </source> - <translation><i>yazar: {0}</i><br /> + <translation type="obsolete"><i>yazar: {0}</i><br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="205"/> <source><i>date: {0}</i><br /> </source> - <translation><i>tarih: {0}</i><br /> + <translation type="obsolete"><i>tarih: {0}</i><br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="191"/> <source> (copied from {0}, revision {1})</source> - <translation> ({0}den kaydedildi, gözden geçirme {1})</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="42"/> - <source>Select to show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="45"/> - <source>Show differences side-by-side</source> - <translation type="unfinished"></translation> + <translation type="obsolete"> ({0}den kaydedildi, gözden geçirme {1})</translation> </message> </context> <context> @@ -54377,177 +54785,177 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="634"/> <source>Version Control</source> <translation>Sürüm Kontrol</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="654"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="646"/> <source>Update from repository</source> <translation>Kaynak Havuzundan güncelle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="658"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="650"/> <source>Commit changes to repository...</source> <translation>Yapılan değişiklekleri kaynak havuzuna teslim et...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="656"/> <source>Add to repository</source> <translation>Kaynak havuzuna ekle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="385"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="381"/> <source>Add tree to repository</source> <translation>Kaynak havuzuna dal ekle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="660"/> <source>Remove from repository (and disk)</source> <translation>Kaynak havuzundan kaldır (ve diskten)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="667"/> <source>Add to Changelist</source> <translation>Değişiklik Listesine Ekle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="679"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="671"/> <source>Remove from Changelist</source> <translation>DEğişiklik listesinden çıkar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="566"/> <source>Show log</source> - <translation>Kayıtı göster</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="570"/> + <translation type="obsolete">Kayıtı göster</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="562"/> <source>Show log browser</source> <translation>Kayıt gözatıcısını gösted</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="684"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="676"/> <source>Show status</source> <translation>Durumu Göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="286"/> <source>Show annotated file</source> <translation>Açıklama dosyalarını göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="696"/> <source>Revert changes</source> <translation>Değişiklikleri başa döndür</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="700"/> + <source>Merge changes</source> + <translation>Değişiklikleri birleştir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="430"/> + <source>Lock</source> + <translation>Kilitli</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="434"/> + <source>Unlock</source> + <translation>Kilitsiz</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="438"/> + <source>Break Lock</source> + <translation>Kırma Kilidi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="442"/> + <source>Steal Lock</source> + <translation>Hırsızlık Kilidi</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="708"/> - <source>Merge changes</source> - <translation>Değişiklikleri birleştir</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="434"/> - <source>Lock</source> - <translation>Kilitli</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="438"/> - <source>Unlock</source> - <translation>Kilitsiz</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="442"/> - <source>Break Lock</source> - <translation>Kırma Kilidi</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="446"/> - <source>Steal Lock</source> - <translation>Hırsızlık Kilidi</translation> + <source>Set Property</source> + <translation>Özellikleri Ayarla</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="710"/> + <source>List Properties</source> + <translation>Özellikleri Listele</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="713"/> + <source>Delete Property</source> + <translation>Özellikleri Sil</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="716"/> - <source>Set Property</source> - <translation>Özellikleri Ayarla</translation> + <source>Select all local file entries</source> + <translation>tüm yerel dosyalırın girişini seç</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="718"/> - <source>List Properties</source> - <translation>Özellikleri Listele</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="721"/> - <source>Delete Property</source> - <translation>Özellikleri Sil</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="724"/> - <source>Select all local file entries</source> - <translation>tüm yerel dosyalırın girişini seç</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="726"/> <source>Select all versioned file entries</source> <translation>Giriş yapılan tüm dosyaları seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="720"/> <source>Select all local directory entries</source> <translation>Tüm yerel dizin kalemlerini seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="730"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="722"/> <source>Select all versioned directory entries</source> <translation>Giriş yapılan tüm dizinleri seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="733"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="725"/> <source>Configure...</source> <translation>Ayarlanıyor...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="572"/> <source>Show repository info</source> <translation>Kaynak havuzu bilgisini göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="547"/> <source>Copy</source> <translation type="unfinished">Kopyala</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="549"/> <source>Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="681"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="271"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="267"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="693"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="685"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="276"/> <source>Show differences side-by-side (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="698"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="690"/> <source>Show differences (URLs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="712"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> @@ -54616,416 +55024,396 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/> - <source>Show log</source> - <translation>Kayıtı göster</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/> - <source>Show &log</source> - <translation>Kayıtı &göster</translation> + <source>Show log browser</source> + <translation>Kayıt gözatıcısını gösted</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="104"/> - <source>Show the log of the local project</source> - <translation>Yerel projenin günlük kaydını göster</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="107"/> - <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="114"/> - <source>Show log browser</source> - <translation>Kayıt gözatıcısını gösted</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="119"/> - <source>Show a dialog to browse the log of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="122"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/> <source>Show &difference</source> <translation>Farkları gös&ter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="121"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="137"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="153"/> <source>Show the difference of the project between two repository URLs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="164"/> <source>Show status</source> <translation>Durumu Göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="164"/> <source>Show &status</source> <translation>Durumu gö&ster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="169"/> <source>Show the status of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="172"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="195"/> + <source>Tag in repository</source> + <translation>Kaynak havuzu etiketi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="195"/> + <source>&Tag in repository...</source> + <translation>Kaynak havuzu e&tiketi...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="200"/> + <source>Tag the local project in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="203"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="210"/> - <source>Tag in repository</source> - <translation>Kaynak havuzu etiketi</translation> + <source>Export from repository</source> + <translation>Kaynak havuzundan ihraç et</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="210"/> - <source>&Tag in repository...</source> - <translation>Kaynak havuzu e&tiketi...</translation> + <source>&Export from repository...</source> + <translation>Dışarı kaynak havuzundan ihraç &et...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="215"/> - <source>Tag the local project in the repository</source> - <translation type="unfinished"></translation> + <source>Export a project from the repository</source> + <translation>Dışa Kaynak havuzundan proje aktar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="218"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished"></translation> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>Kaynak havuzundan dışa aktar</b><p>Bu kaynak havuzundan bir projeyi dışa aktarır.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/> - <source>Export from repository</source> - <translation>Kaynak havuzundan ihraç et</translation> + <source>Command options</source> + <translation>Komut seçenekleri</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/> - <source>&Export from repository...</source> - <translation>Dışarı kaynak havuzundan ihraç &et...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="230"/> - <source>Export a project from the repository</source> - <translation>Dışa Kaynak havuzundan proje aktar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="233"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation><b>Kaynak havuzundan dışa aktar</b><p>Bu kaynak havuzundan bir projeyi dışa aktarır.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="240"/> - <source>Command options</source> - <translation>Komut seçenekleri</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="240"/> <source>Command &options...</source> <translation>K&omut seçenekleri...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="229"/> <source>Show the VCS command options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="231"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="238"/> + <source>Revert changes</source> + <translation>Değişiklikleri başa döndür</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="238"/> + <source>Re&vert changes</source> + <translation>Değişiklikleri ba&şa döndür</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="243"/> + <source>Revert all changes made to the local project</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="246"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/> - <source>Revert changes</source> - <translation>Değişiklikleri başa döndür</translation> + <source>Merge</source> + <translation>Birleştir</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/> - <source>Re&vert changes</source> - <translation>Değişiklikleri ba&şa döndür</translation> + <source>Mer&ge changes...</source> + <translation>De&ğişiklikleri birleştir...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="258"/> - <source>Revert all changes made to the local project</source> + <source>Merge changes of a tag/revision into the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="261"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="268"/> - <source>Merge</source> - <translation>Birleştir</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="268"/> - <source>Mer&ge changes...</source> - <translation>De&ğişiklikleri birleştir...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="273"/> - <source>Merge changes of a tag/revision into the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="276"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="269"/> <source>Switch</source> <translation>Değiştirmek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="269"/> <source>S&witch...</source> <translation>Deği&ştirmek...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="274"/> <source>Switch the local copy to another tag/branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="277"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> <source>Cleanup</source> <translation>Temizle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> <source>Cleanu&p</source> <translation>Temi&zle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="303"/> <source>Cleanup the local project</source> <translation>Yerel projeyi temizle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="306"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Temizle</b><p>Bu yerel projeyi sıfırlar.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="328"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="313"/> <source>Execute command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="328"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="313"/> <source>E&xecute command...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="317"/> <source>Execute an arbitrary VCS command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="320"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="327"/> <source>List tags</source> <translation>Etiketleri listele</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="327"/> <source>List tags...</source> <translation>Etiketleri listele...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="331"/> <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="334"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="341"/> <source>List branches</source> <translation>Branşlar listesi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="341"/> <source>List branches...</source> <translation>Branşlar listesi...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="345"/> <source>List branches of the project</source> <translation>Prosenin branşlar listesi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="348"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Branş listesi</b><p>Bu listeler prosenin branş listeleridir.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="355"/> <source>List repository contents</source> <translation>Kaynak Havuzu içeriğini listele</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="355"/> <source>List repository contents...</source> <translation>Kaynak Havuzu içeriğini listele...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="374"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="359"/> <source>Lists the contents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="377"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="362"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="369"/> <source>Set Property</source> <translation>Özellikleri Ayarla</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="369"/> <source>Set Property...</source> <translation>Özellikleri Ayarla...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="373"/> <source>Set a property for the project files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="376"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="383"/> <source>List Properties</source> <translation>Özellikleri Listele</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="383"/> <source>List Properties...</source> <translation>Özellikler Listeleniyor...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="387"/> <source>List properties of the project files</source> <translation>Proje dosyalarının özelliklerin listele</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="390"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="397"/> <source>Delete Property</source> <translation>Özellikleri Sil</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="397"/> <source>Delete Property...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="401"/> + <source>Delete a property for the project files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="404"/> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/> + <source>Relocate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/> + <source>Relocate...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="416"/> - <source>Delete a property for the project files</source> + <source>Relocate the working copy to a new repository URL</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="419"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="426"/> - <source>Relocate</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="426"/> - <source>Relocate...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="431"/> - <source>Relocate the working copy to a new repository URL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="434"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="427"/> + <source>Repository Browser</source> + <translation>Kaynak Havuzu Gözatıcısı</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="427"/> + <source>Repository Browser...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="432"/> + <source>Show the Repository Browser dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="435"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> - <source>Repository Browser</source> - <translation>Kaynak Havuzu Gözatıcısı</translation> + <source>Configure</source> + <translation>Yapılandırma</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> - <source>Repository Browser...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="447"/> - <source>Show the Repository Browser dialog</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="450"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> - <source>Configure</source> - <translation>Yapılandırma</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> <source>Configure...</source> <translation>Ayarlanıyor...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="461"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="446"/> <source>Show the configuration dialog with the Subversion page selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="464"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="449"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation type="unfinished"></translation> </message> @@ -55035,92 +55423,92 @@ <translation type="obsolete">Kaynak havuzu bilgisini göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="288"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="291"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> <source>Show change lists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="184"/> <source>Show the change lists and associated files of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="202"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="187"/> <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> <source>Upgrade</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> <source>Upgrade...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="476"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="461"/> <source>Upgrade the working copy to the current format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="479"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="464"/> <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="132"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="148"/> <source>Show differences (URLs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="124"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="140"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="156"/> <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="559"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="543"/> <source>Subversion (svn)</source> <translation type="unfinished">Altsürüm (svn)</translation> </message> @@ -59392,22 +59780,22 @@ <translation>Hepsi</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="66"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="62"/> <source>Language:</source> <translation>Dil:</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="70"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="69"/> <source>GROUP</source> <translation>GRUP</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="103"/> <source>Close dialog</source> <translation>Diyaloğu kapat</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="103"/> <source>Do you really want to close the dialog?</source> <translation>Diyaloğu kapatmak istediğinizden emin misiniz?</translation> </message> @@ -61086,7 +61474,7 @@ <context> <name>UnittestDialog</name> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.py" line="403"/> <source>Unittest</source> <translation>Birimtest</translation> </message> @@ -61272,57 +61660,57 @@ <translation>^Hata: </translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="202"/> + <location filename="../PyUnit/UnittestDialog.py" line="205"/> <source>Python3 Files ({1});;Python2 Files ({0});;All Files (*)</source> <translation>Python3 Dosyaları ({1});;Python2 Dosyaları ({0});; Tüm Dosyalar (*)</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="206"/> + <location filename="../PyUnit/UnittestDialog.py" line="209"/> <source>Python Files (*.py);;All Files (*)</source> <translation>Python Dosyaları (*.py);;Tüm Dosyalar (*)</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="266"/> + <location filename="../PyUnit/UnittestDialog.py" line="269"/> <source>You must enter a test suite file.</source> <translation>Testyönteminin dosyasını girmelisiniz.</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="274"/> + <location filename="../PyUnit/UnittestDialog.py" line="277"/> <source>Preparing Testsuite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.py" line="403"/> <source><p>Unable to run test <b>{0}</b>.<br>{1}<br>{2}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="469"/> + <location filename="../PyUnit/UnittestDialog.py" line="475"/> <source>Running</source> <translation>Çalışıyor</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="493"/> + <location filename="../PyUnit/UnittestDialog.py" line="499"/> <source>Ran {0} test in {1:.3f}s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="497"/> + <location filename="../PyUnit/UnittestDialog.py" line="503"/> <source>Ran {0} tests in {1:.3f}s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="514"/> + <location filename="../PyUnit/UnittestDialog.py" line="520"/> <source>Failure: {0}</source> <translation>Başarısızlık:{0}</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="529"/> + <location filename="../PyUnit/UnittestDialog.py" line="535"/> <source>Error: {0}</source> <translation>Hata: {0}</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="634"/> + <location filename="../PyUnit/UnittestDialog.py" line="640"/> <source>Show Source</source> <translation>Kaynağı Göster</translation> </message> @@ -61357,17 +61745,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="544"/> + <location filename="../PyUnit/UnittestDialog.py" line="550"/> <source> Skipped: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="559"/> + <location filename="../PyUnit/UnittestDialog.py" line="565"/> <source> Expected Failure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="573"/> + <location filename="../PyUnit/UnittestDialog.py" line="579"/> <source> Unexpected Success</source> <translation type="unfinished"></translation> </message> @@ -63746,7 +64134,7 @@ <context> <name>Utilities</name> <message> - <location filename="../Utilities/__init__.py" line="1400"/> + <location filename="../Utilities/__init__.py" line="1403"/> <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> @@ -63965,13 +64353,13 @@ </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="38"/> - <source>&Locals Filter</source> - <translation>Yere&l Süzgeçler</translation> + <source>&Locals Viewer</source> + <translation type="unfinished">Yere&l Süzgeçler</translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="48"/> - <source>&Globals Filter</source> - <translation>Küresel Süz&geçler</translation> + <source>&Globals Viewer</source> + <translation type="unfinished">Küresel Süz&geçler</translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="58"/> @@ -63981,7 +64369,7 @@ <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="61"/> <source><b>Locals Filter List</b> -<p>Select the variable types you want to be filtered out of the locals variables list.</p<</source> +<p>Select the variable types you want to be shown in the local variables viewer.</p<</source> <translation type="unfinished"></translation> </message> <message> @@ -63992,7 +64380,7 @@ <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="81"/> <source><b>Globals Filter List</b> -<p>Select the variable types you want to be filtered out of the globals variables list.</p<</source> +<p>Select the variable types you want to be shown in the global variables viewer.</p<</source> <translation type="unfinished"></translation> </message> <message> @@ -64000,6 +64388,11 @@ <source>Save Default</source> <translation>Öntanımlı Olarak Kaydet</translation> </message> + <message> + <location filename="../Debugger/VariablesFilterDialog.ui" line="28"/> + <source>Select the variable types to be shown in the variables viewers:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VariablesViewer</name> @@ -64560,7 +64953,7 @@ <translation>Güncelle</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="532"/> + <location filename="../VCS/ProjectHelper.py" line="533"/> <source>The project should be reread. Do this now?</source> <translation>Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> @@ -64580,7 +64973,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="532"/> + <location filename="../VCS/ProjectHelper.py" line="533"/> <source>Switch</source> <translation type="unfinished">Değiştirmek</translation> </message> @@ -64660,17 +65053,17 @@ <context> <name>VersionControl</name> <message> - <location filename="../VCS/VersionControl.py" line="573"/> + <location filename="../VCS/VersionControl.py" line="563"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="../VCS/VersionControl.py" line="573"/> + <location filename="../VCS/VersionControl.py" line="563"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> - <location filename="../VCS/VersionControl.py" line="704"/> + <location filename="../VCS/VersionControl.py" line="694"/> <source>Repository status checking is switched off</source> <translation>Kaynak havuzu durum konrol anahtarı kapalı</translation> </message> @@ -69357,6 +69750,7 @@ You have %n tab(s) open.</source> <translation type="unfinished"> <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message> @@ -69447,8 +69841,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserView.py" line="551"/> - <source>Open Link in New Tab Ctrl+LMB</source> - <translation type="unfinished">Yeni sekmede bir bağlantı açar Ctrl+LMB</translation> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation type="unfinished">Yeni sekmede bir bağlantı açar<byte value="x9"/>Ctrl+LMB</translation> </message> <message> <location filename="../WebBrowser/WebBrowserView.py" line="555"/> @@ -71927,24 +72321,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1459"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1426"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Esas #{0}</b></td><td></td></tr> <tr><td><b>Değişiklik seti</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiketler</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branşlar</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1446"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -71953,23 +72347,23 @@ <tr><td><b>Teslim zamnanı</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>İp ucu</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>DEğişiklik seti</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Esas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -71980,12 +72374,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -71996,13 +72390,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2078"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2083"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> @@ -72509,50 +72903,55 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="240"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="243"/> <source>do not assign a lambda expression, use a def</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="243"/> - <source>ambiguous variable name '{0}'</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="246"/> - <source>ambiguous class definition '{0}'</source> + <source>ambiguous variable name '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="249"/> - <source>ambiguous function definition '{0}'</source> + <source>ambiguous class definition '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="252"/> - <source>{0}: {1}</source> + <source>ambiguous function definition '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="255"/> + <source>{0}: {1}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="258"/> <source>{0}</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="240"/> + <source>do not use bare except</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>subversion</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1606"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1586"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Kaynak Havuzu Bilgisi</h3><table><tr><td><b>Altsürüm V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Geçerli Gözden Geçirme</b></td><td>{2}</td></tr><tr><td><b>Teslim edilen gözden geçirme</b></td><td>{3}</td></tr><tr><td><b>Teslim Tarihi</b></td><td>{4}</td></tr><tr><td><b>Teslim Zamanı</b></td><td>{5}</td></tr><tr><td><b>Son yazar</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1741"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1720"/> <source>unknown</source> <translation>bilinmeyen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1746"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1725"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>KAynak Havuzu Bilgisi</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Altsürümn V.</b></td><td>{1}</td></tr><tr><td><b>Altsürüm API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Geçerli Gözden Geçirme</b></td><td>{4}</td></tr><tr><td><b>Teslim edilen gözden geçirme</b></td><td>{5}</td></tr><tr><td><b>Teslim tarihi</b></td><td>{6}</td></tr><tr><td><b>Teslim zamanı</b></td><td>{7}</td></tr><tr><td><b>Son yazar</b></td><td>{8}</td></tr></table></translation> </message>
diff -r 852016bbdedb -r c307358a2ecc i18n/eric6_zh_CN.ts --- a/i18n/eric6_zh_CN.ts Fri Jan 27 19:18:52 2017 +0100 +++ b/i18n/eric6_zh_CN.ts Fri Feb 03 19:20:59 2017 +0100 @@ -3592,231 +3592,231 @@ <context> <name>CodeStyleFixer</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="494"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> <source>Triple single quotes converted to triple double quotes.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> - <source>Introductory quotes corrected to be {0}"""</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="500"/> - <source>Single line docstring put on one line.</source> + <source>Introductory quotes corrected to be {0}"""</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="503"/> + <source>Single line docstring put on one line.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="506"/> <source>Period added to summary line.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> <source>Blank line before function/method docstring removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="509"/> - <source>Blank line inserted before class docstring.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="512"/> - <source>Blank line inserted after class docstring.</source> + <source>Blank line inserted before class docstring.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="515"/> - <source>Blank line inserted after docstring summary.</source> + <source>Blank line inserted after class docstring.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="518"/> - <source>Blank line inserted after last paragraph of docstring.</source> + <source>Blank line inserted after docstring summary.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="521"/> - <source>Leading quotes put on separate line.</source> + <source>Blank line inserted after last paragraph of docstring.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="524"/> - <source>Trailing quotes put on separate line.</source> + <source>Leading quotes put on separate line.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="527"/> + <source>Trailing quotes put on separate line.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> <source>Blank line before class docstring removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> - <source>Blank line after class docstring removed.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="536"/> - <source>Blank line after function/method docstring removed.</source> + <source>Blank line after class docstring removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="539"/> - <source>Blank line after last paragraph removed.</source> + <source>Blank line after function/method docstring removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="542"/> - <source>Tab converted to 4 spaces.</source> + <source>Blank line after last paragraph removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="545"/> - <source>Indentation adjusted to be a multiple of four.</source> + <source>Tab converted to 4 spaces.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="548"/> - <source>Indentation of continuation line corrected.</source> + <source>Indentation adjusted to be a multiple of four.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="551"/> - <source>Indentation of closing bracket corrected.</source> + <source>Indentation of continuation line corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="554"/> - <source>Missing indentation of continuation line corrected.</source> + <source>Indentation of closing bracket corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="557"/> - <source>Closing bracket aligned to opening bracket.</source> + <source>Missing indentation of continuation line corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="560"/> - <source>Indentation level changed.</source> + <source>Closing bracket aligned to opening bracket.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="563"/> - <source>Indentation level of hanging indentation changed.</source> + <source>Indentation level changed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="566"/> + <source>Indentation level of hanging indentation changed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="569"/> <source>Visual indentation corrected.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="584"/> + <source>Extraneous whitespace removed.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="581"/> - <source>Extraneous whitespace removed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="578"/> <source>Missing whitespace added.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="584"/> - <source>Whitespace around comment sign corrected.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="587"/> + <source>Whitespace around comment sign corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="590"/> <source>One blank line inserted.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="591"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> <source>%n blank line(s) inserted.</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="597"/> <source>%n superfluous lines removed</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="598"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="601"/> <source>Superfluous blank lines removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="601"/> - <source>Superfluous blank lines after function decorator removed.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="604"/> - <source>Imports were put on separate lines.</source> + <source>Superfluous blank lines after function decorator removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="607"/> - <source>Long lines have been shortened.</source> + <source>Imports were put on separate lines.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="610"/> + <source>Long lines have been shortened.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="613"/> <source>Redundant backslash in brackets removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="616"/> - <source>Compound statement corrected.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="619"/> - <source>Comparison to None/True/False corrected.</source> + <source>Compound statement corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="622"/> - <source>'{0}' argument added.</source> + <source>Comparison to None/True/False corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="625"/> - <source>'{0}' argument removed.</source> + <source>'{0}' argument added.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="628"/> - <source>Whitespace stripped from end of line.</source> + <source>'{0}' argument removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="631"/> - <source>newline added to end of file.</source> + <source>Whitespace stripped from end of line.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="634"/> - <source>Superfluous trailing blank lines removed from end of file.</source> + <source>newline added to end of file.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="637"/> + <source>Superfluous trailing blank lines removed from end of file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="640"/> <source>'<>' replaced by '!='.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="641"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="644"/> <source>Could not save the file! Skipping it. Reason: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="710"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="713"/> <source> no message defined for code '{0}'</source> <translation type="unfinished"></translation> </message> @@ -7300,197 +7300,197 @@ <context> <name>DocStyleChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="260"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="263"/> <source>module is missing a docstring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="262"/> - <source>public function/method is missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="265"/> - <source>private function/method may be missing a docstring</source> + <source>public function/method is missing a docstring</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="268"/> + <source>private function/method may be missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="271"/> <source>public class is missing a docstring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="270"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="273"/> <source>private class may be missing a docstring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="272"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="275"/> <source>docstring not surrounded by """</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="274"/> - <source>docstring containing \ not surrounded by r"""</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="277"/> - <source>docstring containing unicode character not surrounded by u"""</source> + <source>docstring containing \ not surrounded by r"""</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="280"/> + <source>docstring containing unicode character not surrounded by u"""</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="283"/> <source>one-liner docstring on multiple lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="282"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="285"/> <source>docstring has wrong indentation</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="328"/> + <source>docstring summary does not end with a period</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="291"/> + <source>docstring summary is not in imperative mood (Does instead of Do)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="295"/> + <source>docstring summary looks like a function's/method's signature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="298"/> + <source>docstring does not mention the return value type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="301"/> + <source>function/method docstring is separated by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="304"/> + <source>class docstring is not preceded by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="307"/> + <source>class docstring is not followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="362"/> + <source>docstring summary is not followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="313"/> + <source>last paragraph of docstring is not followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="317"/> + <source>private function/method is missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="320"/> + <source>private class is missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="322"/> + <source>leading quotes of docstring not on separate line</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="325"/> - <source>docstring summary does not end with a period</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="288"/> - <source>docstring summary is not in imperative mood (Does instead of Do)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="292"/> - <source>docstring summary looks like a function's/method's signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="295"/> - <source>docstring does not mention the return value type</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="298"/> - <source>function/method docstring is separated by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="301"/> - <source>class docstring is not preceded by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="304"/> - <source>class docstring is not followed by a blank line</source> + <source>trailing quotes of docstring not on separate line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="332"/> + <source>docstring does not contain a @return line but function/method returns something</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="336"/> + <source>docstring contains a @return line but function/method doesn't return anything</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="340"/> + <source>docstring does not contain enough @param/@keyparam lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="343"/> + <source>docstring contains too many @param/@keyparam lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="346"/> + <source>keyword only arguments must be documented with @keyparam lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="349"/> + <source>order of @param/@keyparam lines does not match the function/method signature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="352"/> + <source>class docstring is preceded by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="354"/> + <source>class docstring is followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="356"/> + <source>function/method docstring is preceded by a blank line</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="359"/> - <source>docstring summary is not followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="310"/> - <source>last paragraph of docstring is not followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="314"/> - <source>private function/method is missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="317"/> - <source>private class is missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="319"/> - <source>leading quotes of docstring not on separate line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="322"/> - <source>trailing quotes of docstring not on separate line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="329"/> - <source>docstring does not contain a @return line but function/method returns something</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="333"/> - <source>docstring contains a @return line but function/method doesn't return anything</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="337"/> - <source>docstring does not contain enough @param/@keyparam lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="340"/> - <source>docstring contains too many @param/@keyparam lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="343"/> - <source>keyword only arguments must be documented with @keyparam lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="346"/> - <source>order of @param/@keyparam lines does not match the function/method signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="349"/> - <source>class docstring is preceded by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="351"/> - <source>class docstring is followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="353"/> - <source>function/method docstring is preceded by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="356"/> <source>function/method docstring is followed by a blank line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="362"/> - <source>last paragraph of docstring is followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="365"/> + <source>last paragraph of docstring is followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="368"/> <source>docstring does not contain a @exception line but function/method raises an exception</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="369"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="372"/> <source>docstring contains a @exception line but function/method doesn't raise an exception</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="374"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="377"/> <source>{0}: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="284"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="287"/> <source>docstring does not contain a summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="327"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="330"/> <source>docstring summary does not start with '{0}'</source> <translation type="unfinished"></translation> </message> @@ -9274,117 +9274,117 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2878"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source>Open File</source> <translation>打开文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="400"/> + <location filename="../QScintilla/Editor.py" line="403"/> <source><b>A Source Editor Window</b><p>This window is used to display and edit a source file. You can open as many of these as you like. The name of the file is displayed in the window's titlebar.</p><p>In order to set breakpoints just click in the space between the line numbers and the fold markers. Via the context menu of the margins they may be edited.</p><p>In order to set bookmarks just Shift click in the space between the line numbers and the fold markers.</p><p>These actions can be reversed via the context menu.</p><p>Ctrl clicking on a syntax error marker shows some info about this error.</p></source> <translation><b>源代码编辑器窗口</b><p>该窗口用于显示和编辑源文件。可以打开任意多个窗口。文件名显示在窗口标题栏中。</p><p>要设置断点只需在行号与折叠标记之间的空白处点击即可。通过页边空白的上下文菜单可进行编辑。</p><p>要设置书签只需按住 Shift 键再在行号与折叠标记之间的空白处点击即可。</p><p>以上行为都可能通过上下文菜单进行反转。</p><p>按住 Ctrl 再语法错误标记上点击可显示该错误的部分信息。</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="658"/> - <source>Undo</source> - <translation>撤消</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="661"/> - <source>Redo</source> - <translation>重做</translation> + <source>Undo</source> + <translation>撤消</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="664"/> + <source>Redo</source> + <translation>重做</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="667"/> <source>Revert to last saved state</source> <translation>还原到最后保存的状态</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="668"/> - <source>Cut</source> - <translation>剪切</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="671"/> - <source>Copy</source> - <translation>复制</translation> + <source>Cut</source> + <translation>剪切</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="674"/> + <source>Copy</source> + <translation>复制</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="677"/> <source>Paste</source> <translation>粘贴</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="679"/> - <source>Indent</source> - <translation>缩进</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="682"/> - <source>Unindent</source> - <translation>取消缩进</translation> + <source>Indent</source> + <translation>缩进</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="685"/> - <source>Comment</source> - <translation>注释</translation> + <source>Unindent</source> + <translation>取消缩进</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="688"/> - <source>Uncomment</source> - <translation>取消注释</translation> + <source>Comment</source> + <translation>注释</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="691"/> - <source>Stream Comment</source> - <translation>流注释</translation> + <source>Uncomment</source> + <translation>取消注释</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="694"/> + <source>Stream Comment</source> + <translation>流注释</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="697"/> <source>Box Comment</source> <translation>块注释</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="698"/> - <source>Select to brace</source> - <translation>选择括号内容</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="700"/> - <source>Select all</source> - <translation>全选</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="701"/> + <source>Select to brace</source> + <translation>选择括号内容</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="703"/> + <source>Select all</source> + <translation>全选</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="704"/> <source>Deselect all</source> <translation>全部取消选择</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7242"/> + <location filename="../QScintilla/Editor.py" line="7249"/> <source>Check spelling...</source> <translation>正在进行拼写检查…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="707"/> + <location filename="../QScintilla/Editor.py" line="710"/> <source>Check spelling of selection...</source> <translation>正在对所选内容进行拼写检查…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="715"/> + <location filename="../QScintilla/Editor.py" line="718"/> <source>Shorten empty lines</source> <translation>缩减空行</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="722"/> + <location filename="../QScintilla/Editor.py" line="725"/> <source>Use Monospaced Font</source> <translation>使用单空格字体</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="727"/> + <location filename="../QScintilla/Editor.py" line="730"/> <source>Autosave enabled</source> <translation>允许自动保存</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="731"/> + <location filename="../QScintilla/Editor.py" line="734"/> <source>Typing aids enabled</source> <translation>允许输入辅助</translation> </message> @@ -9394,27 +9394,27 @@ <translation type="obsolete">自动完成已启用</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="768"/> + <location filename="../QScintilla/Editor.py" line="771"/> <source>Close</source> <translation>关闭</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="774"/> - <source>Save</source> - <translation>保存</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="777"/> + <source>Save</source> + <translation>保存</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="780"/> <source>Save As...</source> <translation>另存为…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="790"/> - <source>Print Preview</source> - <translation>打印预览</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="793"/> + <source>Print Preview</source> + <translation>打印预览</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="796"/> <source>Print</source> <translation>打印</translation> </message> @@ -9429,752 +9429,752 @@ <translation type="obsolete">动态</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="819"/> + <location filename="../QScintilla/Editor.py" line="822"/> <source>Complete from Document</source> <translation type="unfinished">从文档</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="821"/> + <location filename="../QScintilla/Editor.py" line="824"/> <source>Complete from APIs</source> <translation type="unfinished">从 APIs</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="823"/> + <location filename="../QScintilla/Editor.py" line="826"/> <source>Complete from Document and APIs</source> <translation type="unfinished">从文档和 APIs</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="746"/> + <location filename="../QScintilla/Editor.py" line="749"/> <source>Calltip</source> <translation>调用提示</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="837"/> + <location filename="../QScintilla/Editor.py" line="840"/> <source>Check</source> <translation>检查</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="857"/> - <source>Show</source> - <translation>显示</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="859"/> - <source>Code metrics...</source> - <translation>代码度量…</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="860"/> - <source>Code coverage...</source> - <translation>代码覆盖率…</translation> + <source>Show</source> + <translation>显示</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="862"/> - <source>Show code coverage annotations</source> - <translation>显示代码覆盖率注解</translation> + <source>Code metrics...</source> + <translation>代码度量…</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="863"/> + <source>Code coverage...</source> + <translation>代码覆盖率…</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="865"/> - <source>Hide code coverage annotations</source> - <translation>隐藏代码覆盖率注解</translation> + <source>Show code coverage annotations</source> + <translation>显示代码覆盖率注解</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="868"/> + <source>Hide code coverage annotations</source> + <translation>隐藏代码覆盖率注解</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="871"/> <source>Profile data...</source> <translation>剖析数据…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="881"/> + <location filename="../QScintilla/Editor.py" line="884"/> <source>Diagrams</source> <translation>图表</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="883"/> + <location filename="../QScintilla/Editor.py" line="886"/> <source>Class Diagram...</source> <translation>类图…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="885"/> + <location filename="../QScintilla/Editor.py" line="888"/> <source>Package Diagram...</source> <translation>程序包图…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="887"/> + <location filename="../QScintilla/Editor.py" line="890"/> <source>Imports Diagram...</source> <translation>引用图…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="889"/> + <location filename="../QScintilla/Editor.py" line="892"/> <source>Application Diagram...</source> <translation>应用程序图…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="907"/> - <source>Languages</source> - <translation>语言</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="910"/> + <source>Languages</source> + <translation>语言</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="913"/> <source>No Language</source> <translation>无语言</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="933"/> + <location filename="../QScintilla/Editor.py" line="936"/> <source>Guessed</source> <translation>猜测</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1268"/> + <location filename="../QScintilla/Editor.py" line="1271"/> <source>Alternatives</source> <translation>备选</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="953"/> + <location filename="../QScintilla/Editor.py" line="956"/> <source>Encodings</source> <translation>编码</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="994"/> + <location filename="../QScintilla/Editor.py" line="997"/> <source>End-of-Line Type</source> <translation>行尾类型</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="998"/> + <location filename="../QScintilla/Editor.py" line="1001"/> <source>Unix</source> <translation>Unix</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1005"/> + <location filename="../QScintilla/Editor.py" line="1008"/> <source>Windows</source> <translation>Windows</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1012"/> + <location filename="../QScintilla/Editor.py" line="1015"/> <source>Macintosh</source> <translation>Macintosh</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1030"/> + <location filename="../QScintilla/Editor.py" line="1033"/> <source>Export as</source> <translation>导出为</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1153"/> + <location filename="../QScintilla/Editor.py" line="1156"/> <source>Toggle bookmark</source> <translation>切换书签</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1155"/> + <location filename="../QScintilla/Editor.py" line="1158"/> <source>Next bookmark</source> <translation>下一个书签</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1157"/> + <location filename="../QScintilla/Editor.py" line="1160"/> <source>Previous bookmark</source> <translation>上一个书签</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1159"/> + <location filename="../QScintilla/Editor.py" line="1162"/> <source>Clear all bookmarks</source> <translation>清除所有书签</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1179"/> + <location filename="../QScintilla/Editor.py" line="1182"/> <source>Toggle breakpoint</source> <translation>切换断点</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1181"/> - <source>Toggle temporary breakpoint</source> - <translation>切换临时断点</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1184"/> + <source>Toggle temporary breakpoint</source> + <translation>切换临时断点</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1187"/> <source>Edit breakpoint...</source> <translation>编辑断点…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5154"/> + <location filename="../QScintilla/Editor.py" line="5161"/> <source>Enable breakpoint</source> <translation>允许断点</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1189"/> + <location filename="../QScintilla/Editor.py" line="1192"/> <source>Next breakpoint</source> <translation>下一个断点</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1191"/> + <location filename="../QScintilla/Editor.py" line="1194"/> <source>Previous breakpoint</source> <translation>上一个断点</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1193"/> - <source>Clear all breakpoints</source> - <translation>清除所有断点</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1162"/> - <source>Goto syntax error</source> - <translation>转到语法错误处</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1164"/> - <source>Show syntax error message</source> - <translation>显示语法错误消息</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1166"/> - <source>Clear syntax error</source> - <translation>清除语法错误</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1196"/> - <source>Next uncovered line</source> - <translation>下一个未覆盖行</translation> + <source>Clear all breakpoints</source> + <translation>清除所有断点</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1165"/> + <source>Goto syntax error</source> + <translation>转到语法错误处</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1167"/> + <source>Show syntax error message</source> + <translation>显示语法错误消息</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1169"/> + <source>Clear syntax error</source> + <translation>清除语法错误</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="1199"/> - <source>Previous uncovered line</source> - <translation>上一个未覆盖行</translation> + <source>Next uncovered line</source> + <translation>下一个未覆盖行</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="1202"/> + <source>Previous uncovered line</source> + <translation>上一个未覆盖行</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1205"/> <source>Next task</source> <translation>下一个任务</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1204"/> + <location filename="../QScintilla/Editor.py" line="1207"/> <source>Previous task</source> <translation>上一个任务</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1213"/> + <location filename="../QScintilla/Editor.py" line="1216"/> <source>LMB toggles bookmarks</source> <translation>左键切换书签</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1217"/> + <location filename="../QScintilla/Editor.py" line="1220"/> <source>LMB toggles breakpoints</source> <translation>左键切换断点</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1253"/> + <location filename="../QScintilla/Editor.py" line="1256"/> <source>Export source</source> <translation>导出源代码</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1253"/> + <location filename="../QScintilla/Editor.py" line="1256"/> <source>No export format given. Aborting...</source> <translation>没有给定导出格式。终止…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1284"/> + <location filename="../QScintilla/Editor.py" line="1287"/> <source>Pygments Lexer</source> <translation>Pygments 词法分析器</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1284"/> + <location filename="../QScintilla/Editor.py" line="1287"/> <source>Select the Pygments lexer to apply.</source> <translation>选择要应用的 Pygments 词法分析器。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1752"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>Modification of Read Only file</source> <translation>只读文件的改变</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1752"/> + <location filename="../QScintilla/Editor.py" line="1757"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>试图改变只读文件。请先保存到另一个文件中。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2443"/> + <location filename="../QScintilla/Editor.py" line="2448"/> <source>Printing...</source> <translation>打印中…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2460"/> - <source>Printing completed</source> - <translation>打印已完成</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="2462"/> - <source>Error while printing</source> - <translation>打印时出错</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2465"/> + <source>Printing completed</source> + <translation>打印已完成</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2467"/> + <source>Error while printing</source> + <translation>打印时出错</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2470"/> <source>Printing aborted</source> <translation>打印失败</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2823"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source>File Modified</source> <translation>文件已改变</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3041"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source>Save File</source> <translation>保存文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4427"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion</source> <translation>自动完成</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4427"/> + <location filename="../QScintilla/Editor.py" line="4434"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>自动完成无效，没有设定自动完成源。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5157"/> + <location filename="../QScintilla/Editor.py" line="5164"/> <source>Disable breakpoint</source> <translation>去除断点</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5531"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Code Coverage</source> <translation>代码覆盖率</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5531"/> + <location filename="../QScintilla/Editor.py" line="5538"/> <source>Please select a coverage file</source> <translation>请选择一个覆盖率文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5594"/> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>Show Code Coverage Annotations</source> <translation>显示代码覆盖率注解</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5587"/> - <source>All lines have been covered.</source> - <translation>所有行均被已覆盖。</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="5594"/> + <source>All lines have been covered.</source> + <translation>所有行均被已覆盖。</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="5601"/> <source>There is no coverage file available.</source> <translation>没有有效的覆盖率文件。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5709"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Profile Data</source> <translation>剖析数据</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5709"/> + <location filename="../QScintilla/Editor.py" line="5716"/> <source>Please select a profile file</source> <translation>请选择一个剖析文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5869"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>Syntax Error</source> <translation>语法错误</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5869"/> + <location filename="../QScintilla/Editor.py" line="5876"/> <source>No syntax error message available.</source> <translation>语法错误消息无效。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6184"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Macro Name</source> <translation>宏名称</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6184"/> + <location filename="../QScintilla/Editor.py" line="6191"/> <source>Select a macro name:</source> <translation>选择一个宏名称：</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6212"/> + <location filename="../QScintilla/Editor.py" line="6219"/> <source>Load macro file</source> <translation>输入宏文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6255"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Macro files (*.macro)</source> <translation>宏文件 (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6235"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source>Error loading macro</source> <translation>载入宏文件出错</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6255"/> + <location filename="../QScintilla/Editor.py" line="6262"/> <source>Save macro file</source> <translation>保存宏文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6272"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source>Save macro</source> <translation>保存宏</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6288"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source>Error saving macro</source> <translation>保存宏出错</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6301"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Start Macro Recording</source> <translation>开始宏录制</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6301"/> + <location filename="../QScintilla/Editor.py" line="6308"/> <source>Macro recording is already active. Start new?</source> <translation>宏录制已激活。开始录制新宏？</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6327"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Macro Recording</source> <translation>宏录制</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6327"/> + <location filename="../QScintilla/Editor.py" line="6334"/> <source>Enter name of the macro:</source> <translation>输入宏名称：</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6465"/> + <location filename="../QScintilla/Editor.py" line="6472"/> <source>File changed</source> <translation>文件已改变</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6769"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source>Drop Error</source> <translation>降落误差</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6790"/> + <location filename="../QScintilla/Editor.py" line="6797"/> <source>Resources</source> <translation>资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6792"/> - <source>Add file...</source> - <translation>添加文件…</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6794"/> - <source>Add files...</source> - <translation>添加文件…</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6796"/> - <source>Add aliased file...</source> - <translation>添加别名文件…</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6799"/> - <source>Add localized resource...</source> - <translation>添加本地资源…</translation> + <source>Add file...</source> + <translation>添加文件…</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6801"/> + <source>Add files...</source> + <translation>添加文件…</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="6803"/> + <source>Add aliased file...</source> + <translation>添加别名文件…</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6806"/> + <source>Add localized resource...</source> + <translation>添加本地资源…</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6810"/> <source>Add resource frame</source> <translation>添加资源结构</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6822"/> + <location filename="../QScintilla/Editor.py" line="6829"/> <source>Add file resource</source> <translation>添加文件资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6838"/> + <location filename="../QScintilla/Editor.py" line="6845"/> <source>Add file resources</source> <translation>添加多个文件资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6866"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Add aliased file resource</source> <translation>添加别名文件资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6930"/> + <location filename="../QScintilla/Editor.py" line="6937"/> <source>Package Diagram</source> <translation>程序包图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6930"/> + <location filename="../QScintilla/Editor.py" line="6937"/> <source>Include class attributes?</source> <translation>包含类属性？</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6950"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Imports Diagram</source> <translation>引用图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6950"/> + <location filename="../QScintilla/Editor.py" line="6957"/> <source>Include imports from external modules?</source> <translation>从外部模块包含引用？</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6964"/> + <location filename="../QScintilla/Editor.py" line="6971"/> <source>Application Diagram</source> <translation>应用程序图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6964"/> + <location filename="../QScintilla/Editor.py" line="6971"/> <source>Include module names?</source> <translation>包含模块名？</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7245"/> + <location filename="../QScintilla/Editor.py" line="7252"/> <source>Add to dictionary</source> <translation>添加到文件夹</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7247"/> + <location filename="../QScintilla/Editor.py" line="7254"/> <source>Ignore All</source> <translation>全部忽略</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="711"/> + <location filename="../QScintilla/Editor.py" line="714"/> <source>Remove from dictionary</source> <translation>从词典里移除</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="340"/> + <location filename="../QScintilla/Editor.py" line="343"/> <source><p>The size of the file <b>{0}</b> is <b>{1} KB</b>. Do you really want to load it?</p></source> <translation><p>文件 <b>{0}</b> 的大小为 <b>{1} KB</b>。确认要读取它？</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1245"/> + <location filename="../QScintilla/Editor.py" line="1248"/> <source><p>No exporter available for the export format <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1264"/> + <location filename="../QScintilla/Editor.py" line="1267"/> <source>Alternatives ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2823"/> + <location filename="../QScintilla/Editor.py" line="2828"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>文件 <b>{0}</b> 有未保存的更改。</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2878"/> + <location filename="../QScintilla/Editor.py" line="2883"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>文件 <b>{0}</b> 无法打开。</p><p>原因：{1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2982"/> + <location filename="../QScintilla/Editor.py" line="2987"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>文件 <b>{0}</b> 无法保存。<br />原因：{1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6226"/> + <location filename="../QScintilla/Editor.py" line="6233"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6235"/> + <location filename="../QScintilla/Editor.py" line="6242"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6288"/> + <location filename="../QScintilla/Editor.py" line="6295"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6629"/> + <location filename="../QScintilla/Editor.py" line="6636"/> <source>{0} (ro)</source> <translation>{0}（只读）</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6769"/> + <location filename="../QScintilla/Editor.py" line="6776"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> 不是一个文件。</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6866"/> + <location filename="../QScintilla/Editor.py" line="6873"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1169"/> - <source>Next warning</source> - <translation>下一个警告</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1172"/> + <source>Next warning</source> + <translation>下一个警告</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1175"/> <source>Previous warning</source> <translation>上一个警告</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1174"/> + <location filename="../QScintilla/Editor.py" line="1177"/> <source>Show warning message</source> <translation>显示警告信息</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1176"/> + <location filename="../QScintilla/Editor.py" line="1179"/> <source>Clear warnings</source> <translation>清空警告</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3041"/> + <location filename="../QScintilla/Editor.py" line="3046"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>文件 <b>{0}</b> 已经存在。是否覆盖？</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6272"/> + <location filename="../QScintilla/Editor.py" line="6279"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>宏文件 <b>{0}</b> 已经存在。是否覆盖？</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6123"/> - <source>Warning: {0}</source> - <translation>警告：{0}</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6130"/> + <source>Warning: {0}</source> + <translation>警告：{0}</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6137"/> <source>Error: {0}</source> <translation>错误：{0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6461"/> + <location filename="../QScintilla/Editor.py" line="6468"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>警告：</b>您在重新打开时将丢失所有更改。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4532"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Activating Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4532"/> + <location filename="../QScintilla/Editor.py" line="4539"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4852"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Activating Calltip Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4852"/> + <location filename="../QScintilla/Editor.py" line="4859"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="786"/> + <location filename="../QScintilla/Editor.py" line="789"/> <source>Open 'rejection' file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="893"/> + <location filename="../QScintilla/Editor.py" line="896"/> <source>Load Diagram...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1207"/> - <source>Next change</source> - <translation>下一个更改</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1210"/> + <source>Next change</source> + <translation>下一个更改</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1213"/> <source>Previous change</source> <translation>上一个更改</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7659"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7659"/> + <location filename="../QScintilla/Editor.py" line="7666"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6059"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>Warning</source> <translation>警告</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6059"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6120"/> + <location filename="../QScintilla/Editor.py" line="6127"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="760"/> - <source>New Document View</source> - <translation>新建文档视图</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="763"/> + <source>New Document View</source> + <translation>新建文档视图</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="766"/> <source>New Document View (with new split)</source> <translation>新建文档视图（在新拆分页中）</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="847"/> + <location filename="../QScintilla/Editor.py" line="850"/> <source>Tools</source> <translation>工具</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="975"/> + <location filename="../QScintilla/Editor.py" line="978"/> <source>Re-Open With Encoding</source> <translation>使用指定编码重新打开</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6455"/> + <location filename="../QScintilla/Editor.py" line="6462"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="738"/> + <location filename="../QScintilla/Editor.py" line="741"/> <source>Automatic Completion enabled</source> <translation>允许自动补全</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="816"/> + <location filename="../QScintilla/Editor.py" line="819"/> <source>Complete</source> <translation>补全</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4581"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4581"/> + <location filename="../QScintilla/Editor.py" line="4588"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4895"/> + <location filename="../QScintilla/Editor.py" line="4902"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7746"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7746"/> + <location filename="../QScintilla/Editor.py" line="7753"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="780"/> + <location filename="../QScintilla/Editor.py" line="783"/> <source>Save Copy...</source> <translation type="unfinished">保存副本…</translation> </message> @@ -10252,7 +10252,7 @@ <translation>点击以从已安装的 AIP 文件列表中选择一个 API 文件</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> <source>Add from installed APIs</source> <translation>从已安装的 API 中添加</translation> </message> @@ -10262,7 +10262,7 @@ <translation>点击以从通过插件安装的 API 文件列表中选择一个 API 文件</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> <source>Add from Plugin APIs</source> <translation>从插件 API 中添加</translation> </message> @@ -10272,7 +10272,7 @@ <translation>点击编译已选 API 定义</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="299"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="301"/> <source>Compile APIs</source> <translation>编译 API</translation> </message> @@ -10287,22 +10287,22 @@ <translation>API 文件 (*.api);;所有文件 (*)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="238"/> <source>Select from the list of installed API files</source> <translation>选择从已安装的 API 文件列表</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> <source>Select from the list of API files installed by plugins</source> <translation>选择从通过插件安装的 API 文件列表</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="314"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="316"/> <source>Cancel compilation</source> <translation>取消编译</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> <source>There are no APIs installed yet. Selection is not available.</source> <translation>没有已安装的 API。选择不可用。</translation> </message> @@ -10474,6 +10474,89 @@ </message> </context> <context> + <name>EditorButtonsWidget</name> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="175"/> + <source>Bold</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="177"/> + <source>Italic</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="179"/> + <source>Strike Through</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="182"/> + <source>Header 1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="184"/> + <source>Header 2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="186"/> + <source>Header 3</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="188"/> + <source>Header</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="193"/> + <source>Inline Code</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="195"/> + <source>Code Block</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="197"/> + <source>Quote</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="200"/> + <source>Add Hyperlink</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="202"/> + <source>Add Horizontal Line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="204"/> + <source>Add Image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="207"/> + <source>Add Bulleted List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="209"/> + <source>Add Numbered List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/EditorButtonsWidget.py" line="273"/> + <source>Level {0}</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>EditorCalltipsPage</name> <message> <location filename="../Preferences/ConfigurationPages/EditorCalltipsPage.ui" line="17"/> @@ -11283,7 +11366,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightersPage.py" line="142"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightersPage.py" line="146"/> <source>Alternative</source> <translation type="unfinished"></translation> </message> @@ -11346,7 +11429,7 @@ <translation>选择行尾填充。</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> <source>Fill to end of line</source> <translation>填充到行尾</translation> </message> @@ -11441,42 +11524,42 @@ <translation>导出所有风格</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="351"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="355"/> <source>Enabled</source> <translation>已开启</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="352"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="356"/> <source>Disabled</source> <translation>已禁用</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> <source>Select fill to end of line for all styles</source> <translation>为所有风格选择行尾填充</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465"/> <source>Export Highlighting Styles</source> <translation>导出高亮风格</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="497"/> <source>Import Highlighting Styles</source> <translation>导入高亮风格</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="477"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="481"/> <source>Highlighting styles file (*.e4h)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465"/> <source><p>The highlighting styles could not be exported to file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="497"/> <source><p>The highlighting styles could not be read from file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -11603,12 +11686,12 @@ <translation>Bash 词法分析器属性</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1048"/> <source>Select whether folding of comments shall be possible</source> <translation>选择是否折叠注释</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1051"/> <source>Fold comments</source> <translation>折叠注释</translation> </message> @@ -11638,22 +11721,22 @@ <translation>缩进开放花括号</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="990"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/> <source>Select whether folding at else statement should be possible</source> <translation>选择是否折叠其它语句</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/> <source>Fold at else</source> <translation>折叠其它</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="522"/> <source>Select whether folding of preprocessor directives shall be possible</source> <translation>选择是否折叠预处理器指令</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="525"/> <source>Fold preprocessor directives</source> <translation>折叠预处理器指令</translation> </message> @@ -11698,127 +11781,127 @@ <translation>标签区分大小写</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/> <source>Pascal Lexer Properties</source> <translation>Pascal 词法分析器属性</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="516"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/> <source>Perl Lexer Properties</source> <translation>Perl 词法分析器属性</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="565"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="594"/> <source>PostScript Lexer Properties</source> <translation>PostScript 词法分析器属性</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="581"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="610"/> <source>Select to mark tokens</source> <translation>选择作标记</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="584"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="613"/> <source>Mark Tokens</source> <translation>作标记</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="593"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="622"/> <source>PostScript Level:</source> <translation>PostScript 级别：</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="600"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="629"/> <source>Select the PostScript level</source> <translation>选择 PostScript 级别</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="637"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/> <source>Povray Lexer Properties</source> <translation>Povray 词法分析器属性</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="643"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/> <source>Select whether folding of directives shall be possible</source> <translation>选择是否折叠指令</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="646"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/> <source>Fold directives</source> <translation>折叠指令</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="685"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> <source>Python Lexer Properties</source> <translation>Python 词法分析器属性</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="796"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="825"/> <source>Select whether bad indentation shall be highlighted</source> <translation>选择是否高亮不良缩进</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="721"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="750"/> <source>Select whether text should be autoindented after a ':'</source> <translation>选择是否自动缩进“：”之后的文本</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="724"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="753"/> <source>Auto indentation after ':'</source> <translation>“：”之后自动缩进</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="730"/> <source>Select whether folding of strings shall be possible</source> <translation>选择是否折叠字符串</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="733"/> <source>Fold strings</source> <translation>折叠字符串</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="827"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/> <source>SQL Lexer Properties</source> <translation>SQL 词法分析器属性</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="863"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="892"/> <source>Select to enable Backslash Escapes</source> <translation>选择开启反斜杠转义</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="866"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="895"/> <source>Backslash Escapes</source> <translation>反斜杠转义</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="964"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/> <source>VHDL Lexer Properties</source> <translation>VHDL 词法分析器属性</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="999"/> <source>Select whether folding of blocks at a parenthesis shall be possible</source> <translation>选择是否折叠圆括号部分</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1002"/> <source>Fold at parenthesis</source> <translation>折叠圆括号</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1009"/> <source>Select whether folding of begin blocks shall be possible</source> <translation>选择是否折叠开始部分</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1012"/> <source>Fold at begin</source> <translation>折叠开始部分</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1013"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1042"/> <source>YAML Lexer Properties</source> <translation>YAML 词法分析器属性</translation> </message> @@ -11868,62 +11951,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="503"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/> <source>Select to enable smart highlighting of keywords</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/> - <source>Smart Highlighting</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/> - <source>Select to enable folding of Perl packages</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="535"/> + <source>Smart Highlighting</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="561"/> + <source>Select to enable folding of Perl packages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="564"/> <source>Fold packages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="542"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="571"/> <source>Select to enable folding of Perl POD blocks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="574"/> <source>Fold POD blocks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="741"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="770"/> <source>Select to allow Python v2 unicode string literals (e.g. u"utf8")</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="744"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="773"/> <source>Allow v2 unicode string literals</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="751"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="780"/> <source>Select to allow Python v3 binary and octal literals (e.g. 0b1011, 0o712)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="754"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/> <source>Allow v3 binary and octal literals</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="761"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="790"/> <source>Select to allow Python v3 bytes string literals (e.g. b"bytes")</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="764"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="793"/> <source>Allow v3 bytes string literals</source> <translation type="unfinished"></translation> </message> @@ -11958,112 +12041,112 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="695"/> <source>Properties Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/> <source>Select to allow initial spaces in a line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/> <source>Allow initial spaces</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="740"/> <source>Select whether folding of triple quoted strings shall be possible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="743"/> <source>Fold triple quoted strings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="760"/> <source>Select to allow strings to span newline characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="734"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="763"/> <source>Strings may span newline characters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="808"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="837"/> <source>Ruby Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="853"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="882"/> <source>Select whether only BEGIN blocks can be folded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="885"/> <source>Only BEGIN blocks can be folded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="873"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="902"/> <source>Select if words may contain dots</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="876"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="905"/> <source>Words may contain dots</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="883"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="912"/> <source>Select to allow '#' as a comment character</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="886"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="915"/> <source>Allow '#' as comment character</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="893"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="922"/> <source>Select to enable quoted identifiers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="896"/> - <source>Enable quoted identifiers</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="906"/> - <source>TCL Lexer Properties</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="925"/> - <source>TeX Lexer Properties</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="941"/> - <source>Select to treat comments as TeX source</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="944"/> - <source>Treat comments as TeX source</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="951"/> - <source>Select to treat \if<unknown> as a command</source> + <source>Enable quoted identifiers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="935"/> + <source>TCL Lexer Properties</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="954"/> + <source>TeX Lexer Properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/> + <source>Select to treat comments as TeX source</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/> + <source>Treat comments as TeX source</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/> + <source>Select to treat \if<unknown> as a command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/> <source>Treat \if<unknown> as command</source> <translation type="unfinished"></translation> </message> @@ -12073,7 +12156,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="774"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="803"/> <source>Highlight sub-identifiers</source> <translation type="unfinished"></translation> </message> @@ -12083,7 +12166,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="771"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="800"/> <source>Select to highlight sub-identifiers defined in keyword set 2</source> <translation type="unfinished"></translation> </message> @@ -12138,32 +12221,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="812"/> <source>Highlight bad indentation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>No Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Inconsistent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Tabs after Spaces</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Spaces</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/> <source>Tabs</source> <translation type="unfinished">选项卡</translation> </message> @@ -12183,7 +12266,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="194"/> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/> <source>Highlight escape sequences</source> <translation type="unfinished"></translation> </message> @@ -12197,6 +12280,26 @@ <source>Allow verbatim string escape sequences</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/> + <source>JSON</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="483"/> + <source>Select to enable highlighting of line/block comments</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="486"/> + <source>Highlight comments</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/> + <source>Select to enable highlighting of escape sequences in strings</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSearchPage</name> @@ -13341,6 +13444,16 @@ <source>Select the colour for the search marker</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1866"/> + <source>Select to hide the Format Buttons bar when formatting is not supported</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1869"/> + <source>Hide Format Buttons bar when not supported</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSyntaxPage</name> @@ -13606,7 +13719,7 @@ <context> <name>EmailDialog</name> <message> - <location filename="../UI/EmailDialog.py" line="339"/> + <location filename="../UI/EmailDialog.py" line="346"/> <source>Send bug report</source> <translation>发送错误报告</translation> </message> @@ -13696,17 +13809,17 @@ <translation>确定要关闭对话框？</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="293"/> + <location filename="../UI/EmailDialog.py" line="300"/> <source>Mail Server Password</source> <translation>邮件服务器密码</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="293"/> + <location filename="../UI/EmailDialog.py" line="300"/> <source>Enter your mail server password</source> <translation>输入你的邮件服务器密码</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="357"/> + <location filename="../UI/EmailDialog.py" line="364"/> <source>Attach file</source> <translation>附加文件</translation> </message> @@ -13716,12 +13829,12 @@ <translation>发送功能请求</translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="311"/> + <location filename="../UI/EmailDialog.py" line="318"/> <source><p>Authentication failed.<br>Reason: {0}</p></source> <translation><p>验证失败。<br>原因：{0}</p></translation> </message> <message> - <location filename="../UI/EmailDialog.py" line="339"/> + <location filename="../UI/EmailDialog.py" line="346"/> <source><p>Message could not be sent.<br>Reason: {0}</p></source> <translation><p>信息无法发送。<br>原因：{0}</p></translation> </message> @@ -13739,67 +13852,67 @@ <translation>输入邮件服务器地址</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="60"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="124"/> <source>Enter the port of the mail server</source> <translation>输入邮件服务器的端口</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="92"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/> <source>Email address:</source> <translation>电子邮件地址：</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="99"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/> <source>Enter your email address</source> <translation>输入你的电子邮件地址</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="106"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="170"/> <source>Signature:</source> <translation>签名：</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="116"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="180"/> <source>Enter your email signature</source> <translation>输入你的电子邮件签名</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="128"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="104"/> <source>Select to use TLS</source> <translation>选择使用 TLS</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="131"/> <source>Use TLS</source> - <translation>使用 TLS</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="138"/> + <translation type="obsolete">使用 TLS</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="192"/> <source>Select to authenticatate against the mail server</source> <translation>选择针对邮件服务器进行鉴别</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="141"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="195"/> <source>Mail server needs authentication</source> <translation>邮件服务器需要鉴别</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="153"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="204"/> <source>Username:</source> <translation>用户名：</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="211"/> <source>Enter your mail server username</source> <translation>输入你的邮件服务器用户名</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="173"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="218"/> <source>Password:</source> <translation>密码：</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="183"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="225"/> <source>Enter your password for accessing the mail server</source> <translation>输入访问邮件服务器的密码</translation> </message> @@ -13811,33 +13924,68 @@ <message> <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/> <source>Outgoing mail server port:</source> - <translation>邮件发送服务器端口：</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="193"/> + <translation type="obsolete">邮件发送服务器端口：</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="235"/> <source>Press to test the login data</source> <translation>点击测试登录信息</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="196"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="238"/> <source>Test Login</source> <translation>测试登录</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/> <source>Login Test</source> <translation>登录测试</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="138"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="204"/> <source>The login test succeeded.</source> <translation>登录测试成功。</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/> + <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/> <source><p>The login test failed.<br>Reason: {0}</p></source> <translation><p>登录测试失败。<br>原因：{0}</p></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/> + <source>Encryption Method:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="81"/> + <source>Select to use no encryption</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="84"/> + <source>None</source> + <translation type="unfinished">无</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="94"/> + <source>Select to use SSL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="97"/> + <source>SSL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="107"/> + <source>TLS</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="117"/> + <source>Port:</source> + <translation type="unfinished">端口：</translation> + </message> </context> <context> <name>EricAccessHandler</name> @@ -14784,12 +14932,12 @@ <context> <name>ExceptionsFilterDialog</name> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="13"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="14"/> <source>Exceptions Filter</source> <translation>异常过滤器</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="16"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="17"/> <source><b>Exception Filter</b> <p>This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the "Start Debugging" dialog is unchecked, no exception will be reported at all.</p> <p>Please note, that unhandled exceptions are always highlighted independent of these settings.</p></source> @@ -14797,42 +14945,42 @@ <p>该对话框用于输入在调试会话期间将被高亮显示的异常类型。如果该列表为空，则所有异常类型都将被高亮显示。如果在“开始调试”对话框中的排除报告标志未被选中，则根本不会报告任何异常。</p><p>请注意，未处理的异常总是被高亮显示，不管如何设置。</p></translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="27"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="28"/> <source>List of exceptions that shall be highlighted</source> <translation>要高亮显示的异常列表</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="42"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="41"/> <source>Press to add the entered exception to the list</source> <translation>点击添加输入的异常到列表中</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="45"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="44"/> <source>Add</source> <translation>添加</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="52"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="51"/> <source>Enter an exception type that shall be highlighted</source> <translation>输入要被高亮显示的异常类型</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="66"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="61"/> <source>Press to delete the selected exception from the list</source> <translation>点击从列表中删除已选异常</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="69"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="64"/> <source>Delete</source> <translation>删除</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="76"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="71"/> <source>Press to delete all exceptions from the list</source> <translation>点击从列表中删除所有异常</translation> </message> <message> - <location filename="../Debugger/ExceptionsFilterDialog.ui" line="79"/> + <location filename="../Debugger/ExceptionsFilterDialog.ui" line="74"/> <source>Delete All</source> <translation>全部删除</translation> </message> @@ -21901,7 +22049,7 @@ <translation type="obsolete">hg 进程已结束，返回值为 {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1822"/> <source>The hg process did not finish within 30s.</source> <translation>hg 进程没有在 30 秒内结束。</translation> </message> @@ -21956,147 +22104,147 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012"/> <source>Reverting changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1057"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1359"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2022"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2427"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2451"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2604"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2730"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2727"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2625"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2475"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>文件 <b>{0}</b> 已经存在。是否覆盖？</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2759"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2710"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2623"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2578"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -22106,72 +22254,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2959"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -22186,157 +22334,157 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Revert changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1030"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="997"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>文件 <b>{0}</b> 无法读取。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1133"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3614"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> <source>Delete Bookmark</source> <translation type="unfinished">删除书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3924"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -24668,7 +24816,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> @@ -24698,17 +24846,17 @@ <translation type="unfinished">选择要过滤的区域</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/> <source>Revision</source> <translation type="unfinished">修订</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> <source>Author</source> <translation type="unfinished">作者</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="103"/> <source>Message</source> <translation type="unfinished">消息</translation> </message> @@ -24733,142 +24881,142 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="285"/> <source>Action</source> <translation type="unfinished">动作</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="290"/> <source>Path</source> <translation type="unfinished">路径</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="295"/> <source>Copy from</source> <translation type="unfinished">复制自</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="306"/> <source>Press to get the next bunch of log entries</source> <translation type="unfinished">点击获得日志条目的下一个分支</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="309"/> <source>&Next</source> <translation>下一个(&N)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="316"/> <source>Enter the limit of entries to fetch</source> <translation type="unfinished">输入要提取条目的限制</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="335"/> <source>Select to stop listing log messages at a copy or move</source> <translation type="unfinished">选择在复制或移动时停止列出日志消息</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="338"/> <source>Stop on Copy/Move</source> <translation type="unfinished">复制或移动时停止</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="398"/> <source>Press to compare two revisions</source> <translation type="unfinished">点击比较两次修订</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="401"/> <source>&Compare Revisions</source> <translation type="unfinished">比较修订(&C)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="462"/> <source>Errors</source> <translation type="unfinished">错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="468"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="484"/> <source>Input</source> <translation type="unfinished">输入</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="474"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="506"/> <source>Press to send the input to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="477"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="509"/> <source>&Send</source> <translation type="unfinished">发送(&S)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="512"/> <source>Alt+S</source> <translation type="unfinished">Alt+S</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="519"/> <source>Enter data to be sent to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="526"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished">选择将输入区域转换成密码模式</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="529"/> <source>&Password Mode</source> <translation type="unfinished">密码模式(&P)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="532"/> <source>Alt+P</source> <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> <source>Added</source> <translation type="unfinished">已添加</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169"/> <source>Deleted</source> <translation type="unfinished">已删除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source>Modified</source> <translation type="unfinished">已修改</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="993"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="993"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="666"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="747"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished">hg 进程没有在 30 秒内结束。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="669"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="750"/> <source>Could not start the hg executable.</source> <translation type="unfinished">无法启动 hg 可执行程序。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="753"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -24878,22 +25026,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="378"/> <source>Press to generate a diff to the first parent revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="381"/> <source>Diff to Parent &1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> <source>Press to generate a diff to the second parent revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="391"/> <source>Diff to Parent &2</source> <translation type="unfinished"></translation> </message> @@ -24908,32 +25056,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="147"/> <source>All</source> <translation type="unfinished">全部</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="77"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> <source>Bookmarks</source> <translation type="unfinished">书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="90"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> @@ -24943,83 +25091,83 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="227"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1899"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2091"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="444"/> <source>Select to show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> <source>Show differences side-by-side</source> <translation type="unfinished">并排显示差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="421"/> <source>Select action from menu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> - <source>Tag</source> - <translation type="unfinished">标签</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="204"/> - <source>Tag the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1773"/> - <source>Switch</source> - <translation type="unfinished">转换</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="209"/> - <source>Switch the working directory to the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/> + <source>Tag</source> + <translation type="unfinished">标签</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="235"/> + <source>Tag the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1951"/> + <source>Switch</source> + <translation type="unfinished">转换</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="240"/> + <source>Switch the working directory to the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="265"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="983"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1087"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -25044,343 +25192,247 @@ <translation type="unfinished">点击查找下一次出现</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Find</source> <translation type="unfinished">查找</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Filter</source> <translation type="unfinished">过滤器</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> - <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2192"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2192"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/> <source>File</source> <translation type="unfinished">文件</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174"/> <source>Draft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> <source>Public</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/> <source>Secret</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2049"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="261"/> <source>Pull changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="274"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1852"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2030"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2091"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> <source>Fetch changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="291"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="245"/> <source>Define Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="248"/> <source>Bookmark the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250"/> <source>Move Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253"/> <source>Move bookmark to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1972"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1972"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1816"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1994"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1816"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1994"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1937"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr><tr><td><b>Children</b></td><td>{5}</td></tr>{6}</table></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="368"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> + <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="14"/> - <source>Mercurial Log</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="26"/> <source>Log</source> - <translation type="unfinished">日志</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="32"/> - <source><b>Mercurial Log</b><p>This shows the output of the hg log command. By clicking on the links you may show the difference between revisions.</p></source> - <translation type="unfinished"></translation> + <translation type="obsolete">日志</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="61"/> <source>Errors</source> - <translation type="unfinished">错误</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="67"/> - <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> - <translation type="unfinished"></translation> + <translation type="obsolete">错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="83"/> <source>Input</source> - <translation type="unfinished">输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="105"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="108"/> <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="111"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="118"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="125"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="128"/> <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="131"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="64"/> <source><b>Processing your request, please wait...</b></source> - <translation type="unfinished"><b>正在处理您的请求，请稍候…</b></translation> + <translation type="obsolete"><b>正在处理您的请求，请稍候…</b></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="74"/> <source>Revision</source> - <translation type="unfinished">修订</translation> + <translation type="obsolete">修订</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/> - <source>No log available for '{0}'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="344"/> - <source>diff to {0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="358"/> - <source>Tags: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="364"/> - <source>Parents: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="367"/> - <source><i>Author: {0}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="371"/> - <source><i>Date: {0}, {1}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="387"/> - <source>Added {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="393"/> - <source>Modified {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="399"/> - <source>Deleted {0}<br /> -</source> - <translation type="unfinished"></translation> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="270"/> <source>The hg process did not finish within 30s.</source> - <translation type="unfinished">hg 进程没有在 30 秒内结束。</translation> + <translation type="obsolete">hg 进程没有在 30 秒内结束。</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> <source>Could not start the hg executable.</source> - <translation type="unfinished">无法启动 hg 可执行程序。</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="276"/> - <source>Mercurial Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="382"/> - <source>Added {0} (copied from {1})<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="361"/> - <source>Bookmarks: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="352"/> - <source>Phase: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="45"/> - <source>Select to show differences side-by-side</source> - <translation type="unfinished"></translation> + <translation type="obsolete">无法启动 hg 可执行程序。</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="48"/> <source>Show differences side-by-side</source> - <translation type="unfinished">并排显示差异</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="355"/> - <source>Branch: {0}<br /> -</source> - <translation type="unfinished"></translation> + <translation type="obsolete">并排显示差异</translation> </message> </context> <context> @@ -25761,87 +25813,87 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="605"/> <source>Version Control</source> <translation>版本控制</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="617"/> <source>Commit changes to repository...</source> <translation>将更改提交到仓库中…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> <source>Add to repository</source> <translation>添加到仓库</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628"/> <source>Remove from repository (and disk)</source> <translation>从仓库（和磁盘）中移除</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="548"/> <source>Show log</source> - <translation>显示日志</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="552"/> + <translation type="obsolete">显示日志</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="544"/> <source>Show log browser</source> <translation>显示日志浏览器</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> <source>Show status</source> <translation>显示状态</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="343"/> <source>Show annotated file</source> <translation>显示有注释的文件</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Revert changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="663"/> <source>Select all local file entries</source> <translation type="unfinished">选择所有本地文件条目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="665"/> <source>Select all versioned file entries</source> <translation type="unfinished">选择所有版本化的文件条目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> <source>Select all local directory entries</source> <translation type="unfinished">选择所有本地文件夹条目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="669"/> <source>Select all versioned directory entries</source> <translation type="unfinished">选择所有版本化的文件夹条目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Remove from repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Do you really want to remove these files from the repository?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="539"/> <source>Copy</source> <translation type="unfinished">复制</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="541"/> <source>Move</source> <translation type="unfinished">移动</translation> </message> @@ -25851,42 +25903,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="639"/> <source>Show differences</source> <translation type="unfinished">显示差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="329"/> <source>Show differences side-by-side</source> <translation type="unfinished">并排显示差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="651"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="643"/> <source>Show differences (extended)</source> <translation type="unfinished">显示差异（扩展）</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="338"/> <source>Show differences side-by-side (extended)</source> <translation type="unfinished">并排显示差异（扩展）</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="653"/> <source>Conflicts resolved</source> <translation type="unfinished">冲突已解决</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="656"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="672"/> <source>Configure...</source> <translation>配置…</translation> </message> @@ -26035,581 +26087,566 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> - <source>Show log</source> - <translation>显示日志</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> - <source>Show &log</source> - <translation>显示日志(&l)</translation> + <source>Show log browser</source> + <translation>显示日志浏览器</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> - <source>Show the log of the local project</source> - <translation>显示本地项目的日志</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation>显示对话框以浏览本地项目的日志</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation><b>显示日志</b><p>显示本地项目的日志。</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> - <source>Show log browser</source> - <translation>显示日志浏览器</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>显示对话框以浏览本地项目的日志</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> + <translation type="obsolete"><b>显示日志</b><p>显示本地项目的日志。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"><b>显示日志浏览器</b><p>显示对话框以浏览本地项目的日志。先显示条目的受限号。稍后可以检索更多信息。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show &difference</source> <translation type="unfinished">显示差异(&d)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> <source>Show the difference of the local project to the repository</source> <translation>显示本地项目与仓库的差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> <source>Show the difference of revisions of the project to the repository</source> <translation>显示项目的修订版本与仓库的差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> <source>Show status</source> <translation>显示状态</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> <source>Show the status of the local project</source> <translation>显示本地项目的状态</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>显示状态</b><p>显示本地项目的状态。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> <source>Show heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Show the heads of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357"/> <source>Show parents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Show the parents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="371"/> <source>Show tip</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <source>Show the tip of the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> + <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <source>Revert changes</source> + <translation type="unfinished">还原改变</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <source>Re&vert changes</source> + <translation type="unfinished">还原改变(&v)</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> - <source>Show the tip of the repository</source> - <translation type="unfinished"></translation> + <source>Revert all changes made to the local project</source> + <translation type="unfinished">还原所有改变到本地项目中</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> - <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> - <translation type="unfinished"></translation> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation type="unfinished"><b>还原改变</b><p>还原所有改变到本地项目中。</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> - <source>Revert changes</source> - <translation type="unfinished">还原改变</translation> + <source>Merge</source> + <translation type="unfinished">合并</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> - <source>Re&vert changes</source> - <translation type="unfinished">还原改变(&v)</translation> + <source>Mer&ge changes...</source> + <translation type="unfinished">合并更改(&g)…</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> - <source>Revert all changes made to the local project</source> - <translation type="unfinished">还原所有改变到本地项目中</translation> + <source>Merge changes of a revision into the local project</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation type="unfinished"><b>还原改变</b><p>还原所有改变到本地项目中。</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> - <source>Merge</source> - <translation type="unfinished">合并</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> - <source>Mer&ge changes...</source> - <translation type="unfinished">合并更改(&g)…</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> - <source>Merge changes of a revision into the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>Tag in repository</source> <translation>在仓库中标记</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <source>&Tag in repository...</source> + <translation>在仓库中标记(&T)…</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <source>Tag the local project in the repository</source> + <translation>在仓库中标记本地项目</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>在仓库中标记</b><p>在仓库中标记本地项目。</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> - <source>&Tag in repository...</source> - <translation>在仓库中标记(&T)…</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> - <source>Tag the local project in the repository</source> - <translation>在仓库中标记本地项目</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>在仓库中标记</b><p>在仓库中标记本地项目。</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags</source> <translation>列出标签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>List tags...</source> <translation>列出标签…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> <source>List tags of the project</source> <translation>列出项目的标签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>列出标签</b><p>列出项目的标签。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>List branches</source> <translation>列出分支</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>List branches...</source> <translation>列出分支…</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> + <source>List branches of the project</source> + <translation>列出项目的分支</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>列出分支</b><p>列出项目的分支。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create branch</source> + <translation>创建分支</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create &branch...</source> + <translation>创建分支(&B)…</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> - <source>List branches of the project</source> - <translation>列出项目的分支</translation> + <source>Create a new branch for the local project in the repository</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>列出分支</b><p>列出项目的分支。</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Create branch</source> - <translation>创建分支</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Create &branch...</source> - <translation>创建分支(&B)…</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> - <source>Create a new branch for the local project in the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> <source>Close branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> <source>Close the current branch of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>Switch</source> <translation type="unfinished">转换</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>S&witch...</source> <translation type="unfinished">转换(&w)…</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <source>Switch the working directory to another revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Cleanup</source> + <translation type="unfinished">清除</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Cleanu&p</source> + <translation type="unfinished">清除(&P)</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Switch the working directory to another revision</source> - <translation type="unfinished"></translation> + <source>Cleanup the local project</source> + <translation type="unfinished">清除本地项目</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> - <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source>Cleanup</source> - <translation type="unfinished">清除</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source>Cleanu&p</source> - <translation type="unfinished">清除(&P)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> - <source>Cleanup the local project</source> - <translation type="unfinished">清除本地项目</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation type="unfinished"><b>清除</b><p>执行对本地项目的清除。</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <source>Execute command</source> + <translation type="unfinished">执行命令</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <source>E&xecute command...</source> + <translation>执行命令(&X)…</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <source>Execute an arbitrary Mercurial command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>Execute command</source> - <translation type="unfinished">执行命令</translation> + <source>Configure</source> + <translation>配置</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>E&xecute command...</source> - <translation>执行命令(&X)…</translation> + <source>Configure...</source> + <translation>配置…</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> - <source>Execute an arbitrary Mercurial command</source> + <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Configure</source> - <translation>配置</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Configure...</source> - <translation>配置…</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> - <source>Show the configuration dialog with the Mercurial page selected</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> - <source>Create a .hgignore file with default values</source> + <source>Create changegroup file collecting changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1793"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> + <source>Apply changegroups...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> - <source>Create changegroup...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> - <source>Create changegroup file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1810"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> - <source>Apply changegroups...</source> + <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> + <source>Show current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Show the current branch of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> - <source>Apply one or several changegroup files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1324"/> - <source>Changegroup Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> - <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> + <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> - <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> - <source>Show current branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> - <source>Show the current branch of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source>Mark as "good"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <source>Skip</source> <translation type="unfinished">跳过</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> <source>Reset</source> <translation type="unfinished">重置</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> @@ -26629,687 +26666,687 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1300"/> <source>Specials</source> <translation type="unfinished">特殊</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1627"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1610"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <source>Show an editor to edit the repository configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Edit repository configuration</source> + <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Edit repository configuration...</source> + <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> - <source>Show an editor to edit the repository configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1849"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1316"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1869"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Export Patches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <source>Export revisions to patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> - <source>Export Patches</source> + <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> - <source>Export Patches...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1889"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> - <source>Change the phase of revisions</source> + <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> - <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1906"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Conflicts resolved</source> + <translation type="unfinished">冲突已解决</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Con&flicts resolved</source> + <translation type="unfinished">冲突已解决(&F)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished">将本地项目的所有冲突标记为已解决状态</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"><b>冲突已解决</b><p>将本地项目中的所有冲突标记为已解决。</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1393"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/> - <source>Copy Changesets (Continue)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Conflicts resolved</source> - <translation type="unfinished">冲突已解决</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Con&flicts resolved</source> - <translation type="unfinished">冲突已解决(&F)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished">将本地项目的所有冲突标记为已解决状态</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation type="unfinished"><b>冲突已解决</b><p>将本地项目中的所有冲突标记为已解决。</p></translation> + <source>Add</source> + <translation type="unfinished">添加</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <source>Add...</source> + <translation type="unfinished">添加…</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <source>Add a sub-repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Add</source> - <translation type="unfinished">添加</translation> + <source>Remove</source> + <translation type="unfinished">移除</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Add...</source> - <translation type="unfinished">添加…</translation> + <source>Remove...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> - <source>Add a sub-repository</source> + <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> - <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> - <source>Remove</source> - <translation type="unfinished">移除</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> - <source>Remove...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> - <source>Remove sub-repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> + <source>Show &status...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <source>Show Summary</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> - <source>Show &status...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> - <source>Show Summary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show summary...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> <source>Show summary information of the working directory status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show differences</source> <translation type="unfinished">显示差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> <source>Show differences (extended)</source> <translation type="unfinished">显示差异（扩展）</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"><b>显示差异</b><p>显示本地项目与仓库之间的差异。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> <source>Cancel uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> <source>Cancel an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <source>List bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <source>List bookmarks...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <source>List bookmarks of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>List bookmarks</source> + <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>List bookmarks...</source> + <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> - <source>List bookmarks of the project</source> + <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Define bookmark</source> + <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Define bookmark...</source> + <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> - <source>Define a bookmark for the project</source> + <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Delete bookmark</source> + <source>Rename bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Delete bookmark...</source> + <source>Rename bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <source>Delete a bookmark of the project</source> + <source>Rename a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Rename bookmark</source> + <source>Move bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Rename bookmark...</source> + <source>Move bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> - <source>Rename a bookmark of the project</source> + <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source>Move bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source>Move bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> - <source>Move a bookmark of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1144"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> <source>Show incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Pull bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> <source>Bookmarks</source> <translation type="unfinished">书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <source>Re-Merge all conflicting, unresolved files of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> - <source>Re-Merge all conflicting, unresolved files of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Show conflicts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Show conflicts...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> - <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> - <source>Conflicts unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> - <source>Mark all conflicts of the local project as unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> - <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> - <source>Manage Changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> + <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <source>Mark all conflicts of the local project as unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> + <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> + <source>Manage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>Mercurial</source> <translation type="unfinished">Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> @@ -30363,6 +30400,42 @@ </message> </context> <context> + <name>HtmlProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/HtmlProvider.py" line="388"/> + <source>Create List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HtmlProvider.py" line="388"/> + <source>Enter desired number of list elements:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HyperlinkMarkupDialog</name> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="14"/> + <source>Insert Hyperlink</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="23"/> + <source>Link Text:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="33"/> + <source>Link Target:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/HyperlinkMarkupDialog.ui" line="43"/> + <source>Link Title:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>IExplorerImporter</name> <message> <location filename="../WebBrowser/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="40"/> @@ -30564,1064 +30637,1089 @@ <translation>Windows 位图文件 (*.bmp)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="128"/> + <location filename="../IconEditor/IconEditorWindow.py" line="130"/> <source>Graphic Interchange Format File (*.gif)</source> <translation type="unfinished">图像交换格式 (*.gif)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="129"/> + <location filename="../IconEditor/IconEditorWindow.py" line="132"/> <source>Windows Icon File (*.ico)</source> <translation>Windows 图标文件 (*.ico)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="130"/> + <location filename="../IconEditor/IconEditorWindow.py" line="134"/> <source>JPEG File (*.jpg)</source> <translation>JPEG 文件 (*.jpg)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="133"/> - <source>Portable Bitmap File (*.pbm)</source> - <translation type="unfinished">可移植位图文件 (*.pbm)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="135"/> - <source>Portable Graymap File (*.pgm)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="136"/> - <source>Portable Network Graphics File (*.png)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="137"/> - <source>Portable Pixmap File (*.ppm)</source> - <translation type="unfinished"></translation> + <source>Portable Bitmap File (*.pbm)</source> + <translation type="unfinished">可移植位图文件 (*.pbm)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="139"/> - <source>Scalable Vector Graphics File (*.svg)</source> + <source>Portable Graymap File (*.pgm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="140"/> + <source>Portable Network Graphics File (*.png)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="141"/> + <source>Portable Pixmap File (*.ppm)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="143"/> - <source>TIFF File (*.tif)</source> - <translation>TIFF 文件 (*.tif)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="146"/> - <source>X11 Bitmap File (*.xbm)</source> - <translation>X11 位图文件 (*.xbm)</translation> + <source>Scalable Vector Graphics File (*.svg)</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="147"/> + <source>TIFF File (*.tif)</source> + <translation>TIFF 文件 (*.tif)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="151"/> + <source>X11 Bitmap File (*.xbm)</source> + <translation>X11 位图文件 (*.xbm)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="152"/> <source>X11 Pixmap File (*.xpm)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="158"/> + <location filename="../IconEditor/IconEditorWindow.py" line="163"/> <source>All Files (*)</source> <translation>所有文件 (*)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>New</source> <translation>新建</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>&New</source> <translation>新建(&N)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="190"/> + <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source>Ctrl+N</source> <comment>File|New</comment> <translation>Ctrl+N</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="196"/> + <location filename="../IconEditor/IconEditorWindow.py" line="201"/> <source>Create a new icon</source> <translation>创建新图标</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="197"/> + <location filename="../IconEditor/IconEditorWindow.py" line="202"/> <source><b>New</b><p>This creates a new icon.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="204"/> + <location filename="../IconEditor/IconEditorWindow.py" line="209"/> <source>New Window</source> <translation>新建窗口</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="204"/> - <source>New &Window</source> - <translation>新建窗口(&W)</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="209"/> + <source>New &Window</source> + <translation>新建窗口(&W)</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="214"/> <source>Open a new icon editor window</source> <translation>打开一个新的图标编辑器窗口</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="211"/> + <location filename="../IconEditor/IconEditorWindow.py" line="216"/> <source><b>New Window</b><p>This opens a new icon editor window.</p></source> <translation><b>新建窗口</b><p>打开一个新的图标编辑器窗口。</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>Open</source> <translation>打开</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>&Open...</source> <translation>打开(&O)…</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="218"/> + <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source>Ctrl+O</source> <comment>File|Open</comment> <translation>Ctrl+O</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="224"/> + <location filename="../IconEditor/IconEditorWindow.py" line="229"/> <source>Open an icon file for editing</source> <translation>打开一个图标文件以编辑</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="225"/> + <location filename="../IconEditor/IconEditorWindow.py" line="230"/> <source><b>Open File</b><p>This opens a new icon file for editing. It pops up a file selection dialog.</p></source> <translation><b>打开文件</b><p>打开一个图标文件以进行编辑。将会弹出一个文件选择对话框。</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>Save</source> <translation>保存</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>&Save</source> <translation>保存(&S)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="233"/> + <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source>Ctrl+S</source> <comment>File|Save</comment> <translation>Ctrl+S</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="239"/> + <location filename="../IconEditor/IconEditorWindow.py" line="244"/> <source>Save the current icon</source> <translation>保存当前图标</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="240"/> + <location filename="../IconEditor/IconEditorWindow.py" line="245"/> <source><b>Save File</b><p>Save the contents of the icon editor window.</p></source> <translation><b>保存文件</b><p>保存当前图标编辑器窗口的内容。</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Save As</source> <translation>另存为</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Save &As...</source> <translation>另存为(&A)…</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="247"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source>Shift+Ctrl+S</source> <comment>File|Save As</comment> <translation>Shift+Ctrl+S</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="253"/> + <location filename="../IconEditor/IconEditorWindow.py" line="258"/> <source>Save the current icon to a new file</source> <translation>将当前图标文件保存到一个新文件中</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="255"/> + <location filename="../IconEditor/IconEditorWindow.py" line="260"/> <source><b>Save As...</b><p>Saves the current icon to a new file.</p></source> <translation><b>另存为…</b><p>将当前图标保存到一个新文件中。</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>Close</source> <translation>关闭</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>&Close</source> <translation>关闭(&C)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="262"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source>Ctrl+W</source> <comment>File|Close</comment> <translation>Ctrl+W</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="268"/> + <location filename="../IconEditor/IconEditorWindow.py" line="273"/> <source>Close the current icon editor window</source> <translation>关闭当前图标编辑器窗口</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="270"/> + <location filename="../IconEditor/IconEditorWindow.py" line="275"/> <source><b>Close</b><p>Closes the current icon editor window.</p></source> <translation><b>关闭</b><p>关闭当前图标编辑器窗口。</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="277"/> + <location filename="../IconEditor/IconEditorWindow.py" line="282"/> <source>Close All</source> <translation>全部关闭</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="277"/> + <location filename="../IconEditor/IconEditorWindow.py" line="282"/> <source>Close &All</source> <translation>全部关闭(&A)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="281"/> + <location filename="../IconEditor/IconEditorWindow.py" line="286"/> <source>Close all icon editor windows</source> <translation>关闭所有图标编辑器窗口</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="283"/> + <location filename="../IconEditor/IconEditorWindow.py" line="288"/> <source><b>Close All</b><p>Closes all icon editor windows except the first one.</p></source> <translation><b>全部关闭</b><p>除了第一个窗口，关闭所有其它图标编辑器窗口。</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>Quit</source> <translation>退出</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>&Quit</source> <translation>退出(&Q)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="303"/> + <location filename="../IconEditor/IconEditorWindow.py" line="308"/> <source>Ctrl+Q</source> <comment>File|Quit</comment> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="309"/> + <location filename="../IconEditor/IconEditorWindow.py" line="314"/> <source>Quit the icon editor</source> <translation>退出图标编辑器</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="310"/> + <location filename="../IconEditor/IconEditorWindow.py" line="315"/> <source><b>Quit</b><p>Quit the icon editor.</p></source> <translation><b>退出</b><p>退出图标编辑器。</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Undo</source> <translation>撤消</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>&Undo</source> <translation>撤消(&U)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Ctrl+Z</source> <comment>Edit|Undo</comment> <translation>Ctrl+Z</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> <source>Alt+Backspace</source> <comment>Edit|Undo</comment> <translation>Alt+Backspace</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="329"/> + <location filename="../IconEditor/IconEditorWindow.py" line="334"/> <source>Undo the last change</source> <translation>撤消最后一次更改</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="330"/> + <location filename="../IconEditor/IconEditorWindow.py" line="335"/> <source><b>Undo</b><p>Undo the last change done.</p></source> <translation><b>撤消</b><p>撤消最后一次更改。</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>Redo</source> <translation>重做</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>&Redo</source> <translation>重做(&R)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="337"/> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> <source>Ctrl+Shift+Z</source> <comment>Edit|Redo</comment> <translation>Ctrl+Shift+Z</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="343"/> + <location filename="../IconEditor/IconEditorWindow.py" line="348"/> <source>Redo the last change</source> <translation>重做最后一次更改</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="344"/> + <location filename="../IconEditor/IconEditorWindow.py" line="349"/> <source><b>Redo</b><p>Redo the last change done.</p></source> <translation><b>重做</b><p>重做最后一次更改。</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Cut</source> <translation>剪切</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Cu&t</source> <translation>剪切(&T)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Ctrl+X</source> <comment>Edit|Cut</comment> <translation>Ctrl+X</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="356"/> <source>Shift+Del</source> <comment>Edit|Cut</comment> <translation>Shift+Del</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="358"/> + <location filename="../IconEditor/IconEditorWindow.py" line="363"/> <source>Cut the selection</source> <translation>剪切所选内容</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="359"/> + <location filename="../IconEditor/IconEditorWindow.py" line="364"/> <source><b>Cut</b><p>Cut the selected image area to the clipboard.</p></source> <translation><b>剪切</b><p>将当前所选图像区域剪切到剪贴板中。</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Copy</source> <translation>复制</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>&Copy</source> <translation>复制(&C)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Ctrl+C</source> <comment>Edit|Copy</comment> <translation>Ctrl+C</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="371"/> <source>Ctrl+Ins</source> <comment>Edit|Copy</comment> <translation>Ctrl+Ins</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="373"/> + <location filename="../IconEditor/IconEditorWindow.py" line="378"/> <source>Copy the selection</source> <translation>复制所选内容</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="374"/> + <location filename="../IconEditor/IconEditorWindow.py" line="379"/> <source><b>Copy</b><p>Copy the selected image area to the clipboard.</p></source> <translation><b>复制</b><p>将当前所选图像区域复制到剪贴板中。</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Paste</source> <translation>粘贴</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>&Paste</source> <translation>粘贴(&P)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Ctrl+V</source> <comment>Edit|Paste</comment> <translation>Ctrl+V</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source>Shift+Ins</source> <comment>Edit|Paste</comment> <translation>Shift+Ins</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="388"/> + <location filename="../IconEditor/IconEditorWindow.py" line="393"/> <source>Paste the clipboard image</source> <translation>粘贴剪切板图像</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="389"/> + <location filename="../IconEditor/IconEditorWindow.py" line="394"/> <source><b>Paste</b><p>Paste the clipboard image.</p></source> <translation><b>粘贴</b><p>粘贴剪切板图像。</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="396"/> + <location filename="../IconEditor/IconEditorWindow.py" line="401"/> <source>Paste as New</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="396"/> + <location filename="../IconEditor/IconEditorWindow.py" line="401"/> <source>Paste as &New</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="400"/> + <location filename="../IconEditor/IconEditorWindow.py" line="405"/> <source>Paste the clipboard image replacing the current one</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="402"/> + <location filename="../IconEditor/IconEditorWindow.py" line="407"/> <source><b>Paste as New</b><p>Paste the clipboard image replacing the current one.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Clear</source> <translation>清除</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Cl&ear</source> <translation>清除(&E)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="409"/> + <location filename="../IconEditor/IconEditorWindow.py" line="414"/> <source>Alt+Shift+C</source> <comment>Edit|Clear</comment> <translation>Alt+Shift+C</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="416"/> + <location filename="../IconEditor/IconEditorWindow.py" line="421"/> <source>Clear the icon image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="417"/> + <location filename="../IconEditor/IconEditorWindow.py" line="422"/> <source><b>Clear</b><p>Clear the icon image and set it to be completely transparent.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>Select All</source> <translation>全选</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>&Select All</source> <translation>全选(&S)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> <source>Ctrl+A</source> <comment>Edit|Select All</comment> <translation>Ctrl+A</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="431"/> + <location filename="../IconEditor/IconEditorWindow.py" line="436"/> <source>Select the complete icon image</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="433"/> + <location filename="../IconEditor/IconEditorWindow.py" line="438"/> <source><b>Select All</b><p>Selects the complete icon image.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="440"/> + <location filename="../IconEditor/IconEditorWindow.py" line="445"/> <source>Change Size</source> <translation>改变大小</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="440"/> + <location filename="../IconEditor/IconEditorWindow.py" line="445"/> <source>Change Si&ze...</source> <translation>改变大小(&Z)…</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="446"/> + <location filename="../IconEditor/IconEditorWindow.py" line="451"/> <source>Change the icon size</source> <translation>改变图标大小</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="447"/> + <location filename="../IconEditor/IconEditorWindow.py" line="452"/> <source><b>Change Size...</b><p>Changes the icon size.</p></source> <translation><b>改变大小…</b><p>改变图标大小。</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="454"/> + <location filename="../IconEditor/IconEditorWindow.py" line="459"/> <source>Grayscale</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="454"/> + <location filename="../IconEditor/IconEditorWindow.py" line="459"/> <source>&Grayscale</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="460"/> + <location filename="../IconEditor/IconEditorWindow.py" line="465"/> <source>Change the icon to grayscale</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="462"/> + <location filename="../IconEditor/IconEditorWindow.py" line="467"/> <source><b>Grayscale</b><p>Changes the icon to grayscale.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Zoom in</source> <translation type="unfinished">放大</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Zoom &in</source> <translation>放大(&I)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="491"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source>Ctrl++</source> <comment>View|Zoom in</comment> <translation>Ctrl++</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="497"/> + <location filename="../IconEditor/IconEditorWindow.py" line="502"/> <source>Zoom in on the icon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="498"/> + <location filename="../IconEditor/IconEditorWindow.py" line="503"/> <source><b>Zoom in</b><p>Zoom in on the icon. This makes the grid bigger.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Zoom out</source> <translation>缩小</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Zoom &out</source> <translation>缩小(&O)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="505"/> + <location filename="../IconEditor/IconEditorWindow.py" line="510"/> <source>Ctrl+-</source> <comment>View|Zoom out</comment> <translation>Ctrl+-</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="511"/> + <location filename="../IconEditor/IconEditorWindow.py" line="516"/> <source>Zoom out on the icon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="512"/> + <location filename="../IconEditor/IconEditorWindow.py" line="517"/> <source><b>Zoom out</b><p>Zoom out on the icon. This makes the grid smaller.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Zoom reset</source> <translation>重置缩放</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Zoom &reset</source> <translation>重置缩放(&R)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="519"/> + <location filename="../IconEditor/IconEditorWindow.py" line="524"/> <source>Ctrl+0</source> <comment>View|Zoom reset</comment> <translation>Ctrl+0</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="535"/> + <location filename="../IconEditor/IconEditorWindow.py" line="540"/> <source>Show Grid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="535"/> + <location filename="../IconEditor/IconEditorWindow.py" line="540"/> <source>Show &Grid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="541"/> + <location filename="../IconEditor/IconEditorWindow.py" line="546"/> <source>Toggle the display of the grid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="543"/> + <location filename="../IconEditor/IconEditorWindow.py" line="548"/> <source><b>Show Grid</b><p>Toggle the display of the grid.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="562"/> + <location filename="../IconEditor/IconEditorWindow.py" line="567"/> <source>Freehand</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="562"/> + <location filename="../IconEditor/IconEditorWindow.py" line="567"/> <source>&Freehand</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="568"/> + <location filename="../IconEditor/IconEditorWindow.py" line="573"/> <source><b>Free hand</b><p>Draws non linear lines.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="577"/> + <location filename="../IconEditor/IconEditorWindow.py" line="582"/> <source>Color Picker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="577"/> + <location filename="../IconEditor/IconEditorWindow.py" line="582"/> <source>&Color Picker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="583"/> + <location filename="../IconEditor/IconEditorWindow.py" line="588"/> <source><b>Color Picker</b><p>The color of the pixel clicked on will become the current draw color.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="594"/> + <location filename="../IconEditor/IconEditorWindow.py" line="599"/> <source>Rectangle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="594"/> + <location filename="../IconEditor/IconEditorWindow.py" line="599"/> <source>&Rectangle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="600"/> + <location filename="../IconEditor/IconEditorWindow.py" line="605"/> <source><b>Rectangle</b><p>Draw a rectangle.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="609"/> + <location filename="../IconEditor/IconEditorWindow.py" line="614"/> <source>Filled Rectangle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="609"/> + <location filename="../IconEditor/IconEditorWindow.py" line="614"/> <source>F&illed Rectangle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="615"/> + <location filename="../IconEditor/IconEditorWindow.py" line="620"/> <source><b>Filled Rectangle</b><p>Draw a filled rectangle.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="625"/> + <location filename="../IconEditor/IconEditorWindow.py" line="630"/> <source>Circle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="631"/> + <location filename="../IconEditor/IconEditorWindow.py" line="636"/> <source><b>Circle</b><p>Draw a circle.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="640"/> + <location filename="../IconEditor/IconEditorWindow.py" line="645"/> <source>Filled Circle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="640"/> + <location filename="../IconEditor/IconEditorWindow.py" line="645"/> <source>Fille&d Circle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="646"/> + <location filename="../IconEditor/IconEditorWindow.py" line="651"/> <source><b>Filled Circle</b><p>Draw a filled circle.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="656"/> + <location filename="../IconEditor/IconEditorWindow.py" line="661"/> <source>Ellipse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="656"/> + <location filename="../IconEditor/IconEditorWindow.py" line="661"/> <source>&Ellipse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="662"/> + <location filename="../IconEditor/IconEditorWindow.py" line="667"/> <source><b>Ellipse</b><p>Draw an ellipse.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="671"/> + <location filename="../IconEditor/IconEditorWindow.py" line="676"/> <source>Filled Ellipse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="671"/> + <location filename="../IconEditor/IconEditorWindow.py" line="676"/> <source>Fille&d Elli&pse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="677"/> + <location filename="../IconEditor/IconEditorWindow.py" line="682"/> <source><b>Filled Ellipse</b><p>Draw a filled ellipse.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="687"/> + <location filename="../IconEditor/IconEditorWindow.py" line="692"/> <source>Flood Fill</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="687"/> + <location filename="../IconEditor/IconEditorWindow.py" line="692"/> <source>Fl&ood Fill</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="693"/> + <location filename="../IconEditor/IconEditorWindow.py" line="698"/> <source><b>Flood Fill</b><p>Fill adjoining pixels with the same color with the current color.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="703"/> + <location filename="../IconEditor/IconEditorWindow.py" line="708"/> <source>Line</source> <translation type="unfinished">行</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="703"/> + <location filename="../IconEditor/IconEditorWindow.py" line="708"/> <source>&Line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="709"/> + <location filename="../IconEditor/IconEditorWindow.py" line="714"/> <source><b>Line</b><p>Draw a line.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="718"/> + <location filename="../IconEditor/IconEditorWindow.py" line="723"/> <source>Eraser (Transparent)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="718"/> + <location filename="../IconEditor/IconEditorWindow.py" line="723"/> <source>Eraser (&Transparent)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="724"/> + <location filename="../IconEditor/IconEditorWindow.py" line="729"/> <source><b>Eraser (Transparent)</b><p>Erase pixels by setting them to transparent.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="733"/> + <location filename="../IconEditor/IconEditorWindow.py" line="738"/> <source>Rectangular Selection</source> <translation type="unfinished">长方形选区</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="750"/> + <location filename="../IconEditor/IconEditorWindow.py" line="755"/> <source>Rect&angular Selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="739"/> + <location filename="../IconEditor/IconEditorWindow.py" line="744"/> <source><b>Rectangular Selection</b><p>Select a rectangular section of the icon using the mouse.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="750"/> + <location filename="../IconEditor/IconEditorWindow.py" line="755"/> <source>Circular Selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="756"/> + <location filename="../IconEditor/IconEditorWindow.py" line="761"/> <source><b>Circular Selection</b><p>Select a circular section of the icon using the mouse.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="773"/> + <location filename="../IconEditor/IconEditorWindow.py" line="778"/> <source>About</source> <translation>关于</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="773"/> + <location filename="../IconEditor/IconEditorWindow.py" line="778"/> <source>&About</source> <translation>关于(&A)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="777"/> + <location filename="../IconEditor/IconEditorWindow.py" line="782"/> <source>Display information about this software</source> <translation>显示软件信息</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="779"/> + <location filename="../IconEditor/IconEditorWindow.py" line="784"/> <source><b>About</b><p>Display some information about this software.</p></source> <translation><b>关于</b><p>显示与本软件有关的部分信息。</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="785"/> + <location filename="../IconEditor/IconEditorWindow.py" line="790"/> <source>About Qt</source> <translation>关于 Qt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="785"/> + <location filename="../IconEditor/IconEditorWindow.py" line="790"/> <source>About &Qt</source> <translation>关于 &Qt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="789"/> + <location filename="../IconEditor/IconEditorWindow.py" line="794"/> <source>Display information about the Qt toolkit</source> <translation>显示 Qt 工具包信息</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="791"/> + <location filename="../IconEditor/IconEditorWindow.py" line="796"/> <source><b>About Qt</b><p>Display some information about the Qt toolkit.</p></source> <translation><b>关于 Qt</b><p>显示 Qt 工具包的部分相关信息。</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>What's This?</source> <translation>这是什么？</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>&What's This?</source> <translation>这是什么(&W)？</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="798"/> + <location filename="../IconEditor/IconEditorWindow.py" line="803"/> <source>Shift+F1</source> <comment>Help|What's This?'</comment> <translation>Shift+F1</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="804"/> + <location filename="../IconEditor/IconEditorWindow.py" line="809"/> <source>Context sensitive help</source> <translation type="unfinished">背景帮助</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="805"/> + <location filename="../IconEditor/IconEditorWindow.py" line="810"/> <source><b>Display context sensitive help</b><p>In What's This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.</p></source> <translation type="unfinished"><b>显示背景帮助</b><p>在“这是什么？”模式中，鼠标光标显示为带问号的箭头，通过点击界面元素你可以获得“在做什么”和“怎样使用”的简短描述。使用标题栏中的上下文帮助按钮可以获得此功能。</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="822"/> + <location filename="../IconEditor/IconEditorWindow.py" line="827"/> <source>&File</source> <translation>文件(&F)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="839"/> + <location filename="../IconEditor/IconEditorWindow.py" line="844"/> <source>&Edit</source> <translation>编辑(&E)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="855"/> + <location filename="../IconEditor/IconEditorWindow.py" line="860"/> <source>&View</source> <translation>视图(&V)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="863"/> + <location filename="../IconEditor/IconEditorWindow.py" line="868"/> <source>&Tools</source> <translation>工具(&T)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="882"/> + <location filename="../IconEditor/IconEditorWindow.py" line="887"/> <source>&Help</source> <translation>帮助(&H)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="892"/> + <location filename="../IconEditor/IconEditorWindow.py" line="897"/> <source>File</source> <translation>文件</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="906"/> + <location filename="../IconEditor/IconEditorWindow.py" line="911"/> <source>Edit</source> <translation>编辑</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="919"/> - <source>View</source> - <translation>视图</translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="924"/> + <source>View</source> + <translation>视图</translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="929"/> <source>Tools</source> <translation>工具</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="942"/> + <location filename="../IconEditor/IconEditorWindow.py" line="947"/> <source>Help</source> <translation>帮助</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="956"/> + <location filename="../IconEditor/IconEditorWindow.py" line="961"/> <source><p>This part of the status bar displays the icon size.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="963"/> + <location filename="../IconEditor/IconEditorWindow.py" line="968"/> <source><p>This part of the status bar displays the cursor position.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1059"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1064"/> <source>Open icon file</source> <translation>打开图标文件</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1109"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1114"/> <source>Save icon file</source> <translation>保存图标文件</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1198"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1203"/> <source>Icon saved</source> <translation>图标已保存</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1213"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1218"/> <source>Untitled</source> <translation>未命名</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1217"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1222"/> <source>Icon Editor</source> <translation>图标编辑器</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="132"/> + <location filename="../IconEditor/IconEditorWindow.py" line="136"/> <source>Multiple-Image Network Graphics File (*.mng)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="525"/> + <location filename="../IconEditor/IconEditorWindow.py" line="530"/> <source>Reset the zoom of the icon</source> <translation>重置图标缩放大小</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="527"/> + <location filename="../IconEditor/IconEditorWindow.py" line="532"/> <source><b>Zoom reset</b><p>Reset the zoom of the icon. This sets the zoom factor to 100%.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="134"/> - <source>Paintbrush Bitmap File (*.pcx)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="138"/> - <source>Silicon Graphics Image File (*.sgi)</source> + <source>Paintbrush Bitmap File (*.pcx)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="142"/> + <source>Silicon Graphics Image File (*.sgi)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="146"/> <source>Targa Graphic File (*.tga)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1145"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1150"/> <source>The file '{0}' does not exist.</source> <translation>文件“{0}”不存在。</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1152"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1157"/> <source>Cannot read file '{0}: {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1186"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1191"/> <source>Cannot write file '{0}: {1}.</source> <translation type="unfinished">无法写入文件 {0}： {1}。</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1217"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1222"/> <source>{0}[*] - {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1109"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1114"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>文件 <b>{0}</b> 已经存在。是否覆盖？</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1238"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1243"/> <source>The icon image has unsaved changes.</source> <translation>图标图像有未保存的更改。</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="131"/> + <location filename="../IconEditor/IconEditorWindow.py" line="135"/> <source>JPEG File (*.jpeg)</source> <translation>JPEG 文件 (*.jpg)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="140"/> - <source>Compressed Scalable Vector Graphics File (*.svgz)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../IconEditor/IconEditorWindow.py" line="144"/> + <source>Compressed Scalable Vector Graphics File (*.svgz)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="148"/> <source>TIFF File (*.tiff)</source> <translation>TIFF 文件 (*.tif)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="145"/> + <location filename="../IconEditor/IconEditorWindow.py" line="149"/> <source>WAP Bitmap File (*.wbmp)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1238"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1243"/> <source>eric6 Icon Editor</source> <translation>eric6 图标编辑器</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1328"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1333"/> <source>About eric6 Icon Editor</source> <translation>关于 eric6 图标编辑器</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="1328"/> + <location filename="../IconEditor/IconEditorWindow.py" line="1333"/> <source>The eric6 Icon Editor is a simple editor component to perform icon drawing tasks.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="290"/> + <location filename="../IconEditor/IconEditorWindow.py" line="295"/> <source>Close Others</source> <translation type="unfinished">关闭其它</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="294"/> + <location filename="../IconEditor/IconEditorWindow.py" line="299"/> <source>Close all other icon editor windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="296"/> + <location filename="../IconEditor/IconEditorWindow.py" line="301"/> <source><b>Close Others</b><p>Closes all other icon editor windows.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="150"/> + <source>WebP Image File (*.webp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="128"/> + <source>Windows Cursor File (*.cur)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="129"/> + <source>DirectDraw-Surface File (*.dds)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="131"/> + <source>Apple Icon File (*.icns)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../IconEditor/IconEditorWindow.py" line="133"/> + <source>JPEG2000 File (*.jp2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>IconSizeDialog</name> @@ -31728,6 +31826,189 @@ </message> </context> <context> + <name>ImageMarkupDialog</name> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="53"/> + <source>Windows Bitmap File (*.bmp)</source> + <translation type="unfinished">Windows 位图文件 (*.bmp)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="54"/> + <source>Windows Cursor File (*.cur)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="55"/> + <source>DirectDraw-Surface File (*.dds)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="56"/> + <source>Graphic Interchange Format File (*.gif)</source> + <translation type="unfinished">图像交换格式 (*.gif)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="57"/> + <source>Apple Icon File (*.icns)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="58"/> + <source>Windows Icon File (*.ico)</source> + <translation type="unfinished">Windows 图标文件 (*.ico)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="59"/> + <source>JPEG2000 File (*.jp2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="60"/> + <source>JPEG File (*.jpg)</source> + <translation type="unfinished">JPEG 文件 (*.jpg)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="61"/> + <source>JPEG File (*.jpeg)</source> + <translation type="unfinished">JPEG 文件 (*.jpg)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="62"/> + <source>Multiple-Image Network Graphics File (*.mng)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="63"/> + <source>Portable Bitmap File (*.pbm)</source> + <translation type="unfinished">可移植位图文件 (*.pbm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="64"/> + <source>Paintbrush Bitmap File (*.pcx)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="65"/> + <source>Portable Graymap File (*.pgm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="66"/> + <source>Portable Network Graphics File (*.png)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="67"/> + <source>Portable Pixmap File (*.ppm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="68"/> + <source>Silicon Graphics Image File (*.sgi)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="69"/> + <source>Scalable Vector Graphics File (*.svg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="70"/> + <source>Compressed Scalable Vector Graphics File (*.svgz)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="72"/> + <source>Targa Graphic File (*.tga)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="73"/> + <source>TIFF File (*.tif)</source> + <translation type="unfinished">TIFF 文件 (*.tif)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="74"/> + <source>TIFF File (*.tiff)</source> + <translation type="unfinished">TIFF 文件 (*.tif)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="75"/> + <source>WAP Bitmap File (*.wbmp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="76"/> + <source>WebP Image File (*.webp)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="77"/> + <source>X11 Bitmap File (*.xbm)</source> + <translation type="unfinished">X11 位图文件 (*.xbm)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="78"/> + <source>X11 Pixmap File (*.xpm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.py" line="89"/> + <source>All Files (*)</source> + <translation type="unfinished">所有文件 (*)</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="14"/> + <source>Add Image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="25"/> + <source>Image Address:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="41"/> + <source>Enter the image path or URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="48"/> + <source>Title:</source> + <translation type="unfinished">标题：</translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="58"/> + <source>Alternative Text:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="73"/> + <source>Keep Original Size</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="80"/> + <source>Keep Aspect Ratio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="89"/> + <source>Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="119"/> + <source> px</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/ImageMarkupDialog.ui" line="109"/> + <source>Height:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ImagesIcon</name> <message> <location filename="../WebBrowser/StatusBar/ImagesIcon.py" line="40"/> @@ -34615,7 +34896,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/LexerAssociationDialog.py" line="131"/> + <location filename="../Project/LexerAssociationDialog.py" line="134"/> <source>Alternative</source> <translation type="unfinished"></translation> </message> @@ -34951,42 +35232,42 @@ <translation>Makefile</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="117"/> + <location filename="../QScintilla/Lexers/__init__.py" line="121"/> <source>Perl</source> <translation>Perl</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="121"/> + <location filename="../QScintilla/Lexers/__init__.py" line="125"/> <source>Povray</source> <translation>Povray</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="123"/> + <location filename="../QScintilla/Lexers/__init__.py" line="127"/> <source>Properties</source> <translation>属性</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="131"/> + <location filename="../QScintilla/Lexers/__init__.py" line="135"/> <source>Ruby</source> <translation>Ruby</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="133"/> - <source>SQL</source> - <translation>SQL</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="137"/> + <source>SQL</source> + <translation>SQL</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="141"/> <source>TeX</source> <translation>TeX</translation> </message> <message> + <location filename="../QScintilla/Lexers/__init__.py" line="143"/> + <source>VHDL</source> + <translation>VHDL</translation> + </message> + <message> <location filename="../QScintilla/Lexers/__init__.py" line="139"/> - <source>VHDL</source> - <translation>VHDL</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="135"/> <source>TCL</source> <translation>TCL</translation> </message> @@ -35001,450 +35282,470 @@ <translation>Fortran77</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="115"/> + <location filename="../QScintilla/Lexers/__init__.py" line="119"/> <source>Pascal</source> <translation>Pascal</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="119"/> + <location filename="../QScintilla/Lexers/__init__.py" line="123"/> <source>PostScript</source> <translation>PostScript</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="141"/> + <location filename="../QScintilla/Lexers/__init__.py" line="145"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="143"/> + <location filename="../QScintilla/Lexers/__init__.py" line="147"/> <source>YAML</source> <translation>YAML</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="171"/> + <location filename="../QScintilla/Lexers/__init__.py" line="175"/> <source>Pygments</source> <translation>Pygments</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="547"/> + <location filename="../QScintilla/Lexers/__init__.py" line="565"/> <source>Pyrex Files (*.pyx)</source> <translation>Pyrex 文件 (*.pyx)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="550"/> - <source>Quixote Template Files (*.ptl)</source> - <translation>Quixote 模板文件 (*.ptl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="553"/> - <source>Ruby Files (*.rb)</source> - <translation>Ruby 文件 (*.rb)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="556"/> - <source>IDL Files (*.idl)</source> - <translation>IDL 文件 (*.idl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="383"/> - <source>C Files (*.h *.c)</source> - <translation>C 文件 (*.h *.c)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="386"/> - <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> - <translation>C++ 文件 (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="568"/> + <source>Quixote Template Files (*.ptl)</source> + <translation>Quixote 模板文件 (*.ptl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="571"/> + <source>Ruby Files (*.rb)</source> + <translation>Ruby 文件 (*.rb)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="574"/> + <source>IDL Files (*.idl)</source> + <translation>IDL 文件 (*.idl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="393"/> + <source>C Files (*.h *.c)</source> + <translation>C 文件 (*.h *.c)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="396"/> + <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source> + <translation>C++ 文件 (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="586"/> <source>C# Files (*.cs)</source> <translation>C# 文件 (*.cs)</translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="392"/> + <location filename="../QScintilla/Lexers/__init__.py" line="402"/> <source>HTML Files (*.html *.htm *.asp *.shtml)</source> <translation>HTML 文件 (*.html *.htm *.asp *.shtml)</translation> </message> <message> + <location filename="../QScintilla/Lexers/__init__.py" line="598"/> + <source>CSS Files (*.css)</source> + <translation>CSS 文件 (*.css)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="601"/> + <source>QSS Files (*.qss)</source> + <translation>QSS 文件 (*.qss)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="411"/> + <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> + <translation>PHP 文件 (*.php *.php3 *.php4 *.php5 *.phtml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="414"/> + <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> + <translation>XML 文件 (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="613"/> + <source>Qt Resource Files (*.qrc)</source> + <translation>Qt 资源文件 (*.qrc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="420"/> + <source>D Files (*.d *.di)</source> + <translation>D 文件 (*.d *.di)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="622"/> + <source>Java Files (*.java)</source> + <translation>Java 文件 (*.java)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="625"/> + <source>JavaScript Files (*.js)</source> + <translation>JavaScript 文件 (*.js)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="628"/> + <source>SQL Files (*.sql)</source> + <translation>SQL 文件 (*.sql)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="631"/> + <source>Docbook Files (*.docbook)</source> + <translation>Docbook 文件 (*.docbook)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="435"/> + <source>Perl Files (*.pl *.pm *.ph)</source> + <translation>Perl 文件 (*.pl *.pm *.ph)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="640"/> + <source>Lua Files (*.lua)</source> + <translation>Lua 文件 (*.lua)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="441"/> + <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> + <translation>Tex 文件 (*.tex *.sty *.aux *.toc *.idx)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="643"/> + <source>Shell Files (*.sh)</source> + <translation>命令行文件 (*.sh)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="447"/> + <source>Batch Files (*.bat *.cmd)</source> + <translation>批处理文件 (*.bat *.cmd)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="450"/> + <source>Diff Files (*.diff *.patch)</source> + <translation>差异文件 (*.diff *.patch)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="453"/> + <source>Makefiles (*.mak)</source> + <translation>Makefiles (*.mak)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="456"/> + <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> + <translation>属性文件 (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="667"/> + <source>Povray Files (*.pov)</source> + <translation>Povray 文件 (*.pov)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="463"/> + <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> + <translation>CMake 文件 (CMakeLists.txt *.cmake *.ctest)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="466"/> + <source>VHDL Files (*.vhd *.vhdl)</source> + <translation>VHDL 文件 (*.vhd *.vhdl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="469"/> + <source>TCL/Tk Files (*.tcl *.tk)</source> + <translation>TCL/Tk 文件 (*.vhd *.vhdl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="472"/> + <source>Fortran Files (*.f90 *.f95 *.f2k)</source> + <translation>Fortran 文件 (*.f90 *.f95 *.f2k)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="475"/> + <source>Fortran77 Files (*.f *.for)</source> + <translation>Fortran77 文件 (*.f *.for)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="478"/> + <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> + <translation>Pascal 文件 (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="694"/> + <source>PostScript Files (*.ps)</source> + <translation>PostScript 文件 (*.ps)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="484"/> + <source>YAML Files (*.yaml *.yml)</source> + <translation>YAML 文件 (*.yaml *.yml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="744"/> + <source>All Files (*)</source> + <translation>所有文件 (*)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="577"/> + <source>C Files (*.c)</source> + <translation>C 文件 (*.c)</translation> + </message> + <message> <location filename="../QScintilla/Lexers/__init__.py" line="580"/> - <source>CSS Files (*.css)</source> - <translation>CSS 文件 (*.css)</translation> + <source>C++ Files (*.cpp)</source> + <translation>C++ 文件 (*.cpp)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="583"/> - <source>QSS Files (*.qss)</source> - <translation>QSS 文件 (*.qss)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="401"/> - <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source> - <translation>PHP 文件 (*.php *.php3 *.php4 *.php5 *.phtml)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="404"/> - <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source> - <translation>XML 文件 (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation> + <source>C++/C Header Files (*.h)</source> + <translation>C++/C 头文件 (*.h)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="589"/> + <source>HTML Files (*.html)</source> + <translation>HTML 文件 (*.html)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="592"/> + <source>PHP Files (*.php)</source> + <translation>PHP 文件 (*.php)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="595"/> - <source>Qt Resource Files (*.qrc)</source> - <translation>Qt 资源文件 (*.qrc)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="410"/> - <source>D Files (*.d *.di)</source> - <translation>D 文件 (*.d *.di)</translation> + <source>ASP Files (*.asp)</source> + <translation>ASP 文件 (*.asp)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="604"/> - <source>Java Files (*.java)</source> - <translation>Java 文件 (*.java)</translation> + <source>XML Files (*.xml)</source> + <translation>XML 文件 (*.xml)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="607"/> - <source>JavaScript Files (*.js)</source> - <translation>JavaScript 文件 (*.js)</translation> + <source>XSL Files (*.xsl)</source> + <translation>XSL 文件 (*.xsl)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="610"/> - <source>SQL Files (*.sql)</source> - <translation>SQL 文件 (*.sql)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="613"/> - <source>Docbook Files (*.docbook)</source> - <translation>Docbook 文件 (*.docbook)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="425"/> - <source>Perl Files (*.pl *.pm *.ph)</source> - <translation>Perl 文件 (*.pl *.pm *.ph)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="622"/> - <source>Lua Files (*.lua)</source> - <translation>Lua 文件 (*.lua)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="431"/> - <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source> - <translation>Tex 文件 (*.tex *.sty *.aux *.toc *.idx)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="625"/> - <source>Shell Files (*.sh)</source> - <translation>命令行文件 (*.sh)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="437"/> - <source>Batch Files (*.bat *.cmd)</source> - <translation>批处理文件 (*.bat *.cmd)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="440"/> - <source>Diff Files (*.diff *.patch)</source> - <translation>差异文件 (*.diff *.patch)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="443"/> - <source>Makefiles (*.mak)</source> - <translation>Makefiles (*.mak)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="446"/> - <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source> - <translation>属性文件 (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation> + <source>DTD Files (*.dtd)</source> + <translation>DTD 文件 (*.dtd)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="616"/> + <source>D Files (*.d)</source> + <translation>D 文件 (*.d)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="619"/> + <source>D Interface Files (*.di)</source> + <translation>D 界面文件 (*.di)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="634"/> + <source>Perl Files (*.pl)</source> + <translation>Perl 文件 (*.pl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="637"/> + <source>Perl Module Files (*.pm)</source> + <translation>Perl 模块文件 (*.pm)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="646"/> + <source>Batch Files (*.bat)</source> + <translation>批处理文件 (*.bat)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="649"/> - <source>Povray Files (*.pov)</source> - <translation>Povray 文件 (*.pov)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="453"/> - <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source> - <translation>CMake 文件 (CMakeLists.txt *.cmake *.ctest)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="456"/> - <source>VHDL Files (*.vhd *.vhdl)</source> - <translation>VHDL 文件 (*.vhd *.vhdl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="459"/> - <source>TCL/Tk Files (*.tcl *.tk)</source> - <translation>TCL/Tk 文件 (*.vhd *.vhdl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="462"/> - <source>Fortran Files (*.f90 *.f95 *.f2k)</source> - <translation>Fortran 文件 (*.f90 *.f95 *.f2k)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="465"/> - <source>Fortran77 Files (*.f *.for)</source> - <translation>Fortran77 文件 (*.f *.for)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="468"/> - <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source> - <translation>Pascal 文件 (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</translation> + <source>TeX Files (*.tex)</source> + <translation>TeX 文件 (*.tex)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="652"/> + <source>TeX Template Files (*.sty)</source> + <translation>TeX 模板文件 (*.sty)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="655"/> + <source>Diff Files (*.diff)</source> + <translation>差异文件 (*.diff)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="658"/> + <source>Make Files (*.mak)</source> + <translation>Make 文件 (*.mak)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="661"/> + <source>Properties Files (*.ini)</source> + <translation>属性文件 (*.ini)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="664"/> + <source>Configuration Files (*.cfg)</source> + <translation>配置文件 (*.cfg)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="670"/> + <source>CMake Files (CMakeLists.txt)</source> + <translation>CMake 文件 (CMakeLists.txt)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="673"/> + <source>CMake Macro Files (*.cmake)</source> + <translation>CMake 宏文件 (*.cmake)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="676"/> - <source>PostScript Files (*.ps)</source> - <translation>PostScript 文件 (*.ps)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="474"/> - <source>YAML Files (*.yaml *.yml)</source> - <translation>YAML 文件 (*.yaml *.yml)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="718"/> - <source>All Files (*)</source> - <translation>所有文件 (*)</translation> + <source>VHDL Files (*.vhd)</source> + <translation>VHDL 文件 (*.vhd)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="679"/> + <source>TCL Files (*.tcl)</source> + <translation>TCL 文件 (*.tcl)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="682"/> + <source>Tk Files (*.tk)</source> + <translation>Tk 文件 (*.tk)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="685"/> + <source>Fortran Files (*.f95)</source> + <translation>Fortran 文件 (*.f95)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="688"/> + <source>Fortran77 Files (*.f)</source> + <translation>Fortran77 文件 (*.f)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="691"/> + <source>Pascal Files (*.pas)</source> + <translation>Pascal 文件 (*.pas)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="697"/> + <source>YAML Files (*.yml)</source> + <translation>YAML 文件 (*.yml)</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="375"/> + <source>Python Files (*.py *.py2 *.py3)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="378"/> + <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="556"/> + <source>Python3 Files (*.py)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="562"/> + <source>Python3 GUI Files (*.pyw)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="553"/> + <source>Python2 Files (*.py2)</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="559"/> - <source>C Files (*.c)</source> - <translation>C 文件 (*.c)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="562"/> - <source>C++ Files (*.cpp)</source> - <translation>C++ 文件 (*.cpp)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="565"/> - <source>C++/C Header Files (*.h)</source> - <translation>C++/C 头文件 (*.h)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="571"/> - <source>HTML Files (*.html)</source> - <translation>HTML 文件 (*.html)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="574"/> - <source>PHP Files (*.php)</source> - <translation>PHP 文件 (*.php)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="577"/> - <source>ASP Files (*.asp)</source> - <translation>ASP 文件 (*.asp)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="586"/> - <source>XML Files (*.xml)</source> - <translation>XML 文件 (*.xml)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="589"/> - <source>XSL Files (*.xsl)</source> - <translation>XSL 文件 (*.xsl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="592"/> - <source>DTD Files (*.dtd)</source> - <translation>DTD 文件 (*.dtd)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="598"/> - <source>D Files (*.d)</source> - <translation>D 文件 (*.d)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="601"/> - <source>D Interface Files (*.di)</source> - <translation>D 界面文件 (*.di)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="616"/> - <source>Perl Files (*.pl)</source> - <translation>Perl 文件 (*.pl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="619"/> - <source>Perl Module Files (*.pm)</source> - <translation>Perl 模块文件 (*.pm)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="628"/> - <source>Batch Files (*.bat)</source> - <translation>批处理文件 (*.bat)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="631"/> - <source>TeX Files (*.tex)</source> - <translation>TeX 文件 (*.tex)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="634"/> - <source>TeX Template Files (*.sty)</source> - <translation>TeX 模板文件 (*.sty)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="637"/> - <source>Diff Files (*.diff)</source> - <translation>差异文件 (*.diff)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="640"/> - <source>Make Files (*.mak)</source> - <translation>Make 文件 (*.mak)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="643"/> - <source>Properties Files (*.ini)</source> - <translation>属性文件 (*.ini)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="646"/> - <source>Configuration Files (*.cfg)</source> - <translation>配置文件 (*.cfg)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="652"/> - <source>CMake Files (CMakeLists.txt)</source> - <translation>CMake 文件 (CMakeLists.txt)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="655"/> - <source>CMake Macro Files (*.cmake)</source> - <translation>CMake 宏文件 (*.cmake)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="658"/> - <source>VHDL Files (*.vhd)</source> - <translation>VHDL 文件 (*.vhd)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="661"/> - <source>TCL Files (*.tcl)</source> - <translation>TCL 文件 (*.tcl)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="664"/> - <source>Tk Files (*.tk)</source> - <translation>Tk 文件 (*.tk)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="667"/> - <source>Fortran Files (*.f95)</source> - <translation>Fortran 文件 (*.f95)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="670"/> - <source>Fortran77 Files (*.f)</source> - <translation>Fortran77 文件 (*.f)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="673"/> - <source>Pascal Files (*.pas)</source> - <translation>Pascal 文件 (*.pas)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="679"/> - <source>YAML Files (*.yml)</source> - <translation>YAML 文件 (*.yml)</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="365"/> - <source>Python Files (*.py *.py2 *.py3)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="368"/> - <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="538"/> - <source>Python3 Files (*.py)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="544"/> - <source>Python3 GUI Files (*.pyw)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="535"/> - <source>Python2 Files (*.py2)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="541"/> <source>Python2 GUI Files (*.pyw2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="125"/> - <source>Python2</source> - <translation type="unfinished">Python2</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="127"/> - <source>Python3</source> - <translation type="unfinished">Python3</translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="148"/> - <source>Matlab</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="148"/> - <source>Octave</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="480"/> - <source>Matlab Files (*.m *.m.matlab)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="685"/> - <source>Matlab Files (*.m)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="685"/> - <source>Octave Files (*.m.octave)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Lexers/__init__.py" line="480"/> - <source>Octave Files (*.m *.m.octave)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Lexers/__init__.py" line="129"/> + <source>Python2</source> + <translation type="unfinished">Python2</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="131"/> + <source>Python3</source> + <translation type="unfinished">Python3</translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="115"/> + <source>Matlab</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="117"/> + <source>Octave</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="487"/> + <source>Matlab Files (*.m *.m.matlab)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="700"/> + <source>Matlab Files (*.m)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="703"/> + <source>Octave Files (*.m.octave)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="490"/> + <source>Octave Files (*.m *.m.octave)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="133"/> <source>QSS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="157"/> + <location filename="../QScintilla/Lexers/__init__.py" line="153"/> <source>Gettext</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="695"/> + <location filename="../QScintilla/Lexers/__init__.py" line="709"/> <source>Gettext Files (*.po)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="162"/> + <location filename="../QScintilla/Lexers/__init__.py" line="158"/> <source>CoffeeScript</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Lexers/__init__.py" line="702"/> + <location filename="../QScintilla/Lexers/__init__.py" line="716"/> <source>CoffeeScript Files (*.coffee)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="163"/> + <source>JSON</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="723"/> + <source>JSON Files (*.json)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="166"/> + <source>Markdown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/__init__.py" line="728"/> + <source>Markdown Files (*.md)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>LfConvertDataDialog</name> @@ -35657,6 +35958,19 @@ </message> </context> <context> + <name>MarkdownProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/MarkdownProvider.py" line="383"/> + <source>Create List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/MarkdownProvider.py" line="383"/> + <source>Enter desired number of list elements:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>MasterPasswordEntryDialog</name> <message> <location filename="../Preferences/ConfigurationPages/MasterPasswordEntryDialog.ui" line="14"/> @@ -35732,12 +36046,12 @@ <context> <name>McCabeChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="423"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="426"/> <source>'{0}' is too complex ({1})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="425"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="428"/> <source>{0}: {1}</source> <translation type="unfinished"></translation> </message> @@ -35765,124 +36079,109 @@ <translation>输入要显示的日志信息数量</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="155"/> <source>Commit</source> <translation>提交</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="161"/> <source>No. of commit messages to remember:</source> <translation>要记住的提交信息数量：</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="168"/> <source>Enter the number of commit messages to remember</source> <translation>输入要记住的提交信息数量</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="216"/> - <source>Incoming / Outgoing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="222"/> - <source>Select to show the incoming and outgoing log in a log browser dialog</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="225"/> - <source>Use Log Browser for incoming / outgoing log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="235"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="242"/> + <source>Select to update the working directory to new tip</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="236"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="241"/> - <source>Select to update the working directory to new tip</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="245"/> <source>Update after pulling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="334"/> <source>Edit the Mercurial configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="337"/> <source>Edit configuration file</source> <translation>编辑配置文件</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="311"/> <source>Cleanup</source> <translation type="unfinished">清除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="317"/> <source>Pattern:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="324"/> <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="252"/> <source>Select to prefer unbundle over pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="255"/> <source><b>Prefer Unbundle</b> <p>If this option is selected, it will be checked, if a Mercurial changegroups file from a previous "Show Incoming" request exists. In this case it will be applied and deleted. Otherwise a pull request will be sent.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="259"/> <source>Prefer Unbundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="292"/> <source>Revert</source> <translation type="unfinished">还原</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="298"/> <source>Select to create a backup file (.orig) before reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="301"/> <source>Create Backup Files</source> <translation>创建备份文件</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="269"/> <source>Merge</source> <translation>合并</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="275"/> <source>Select to enforce usage of the Mercural internal merge tool</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="278"/> <source><b>Internal Merge Tool</b> <p>Select to enforce usage of the Mercural internal merge tool,which leaves conflict markers in the file in case of conflicting changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="282"/> <source>Use internal merge with conflict markers</source> <translation type="unfinished"></translation> </message> @@ -35917,15 +36216,25 @@ <translation>考虑隐藏的更改集</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="197"/> <source>No. of commit authors to remember:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="204"/> <source>Enter the number of commit authors to remember</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="132"/> + <source>No. of message characters shown in list:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="139"/> + <source>Enter the number of characters of the commit message to be shown in the list</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -36884,107 +37193,107 @@ <context> <name>MiscellaneousChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="429"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="432"/> <source>coding magic comment not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="432"/> - <source>unknown encoding ({0}) found in coding magic comment</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="435"/> - <source>copyright notice not present</source> + <source>unknown encoding ({0}) found in coding magic comment</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="438"/> - <source>copyright notice contains invalid author</source> + <source>copyright notice not present</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="441"/> - <source>blind except: statement</source> + <source>copyright notice contains invalid author</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="444"/> - <source>found {0} formatter</source> + <source>blind except: statement</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="447"/> - <source>format string does contain unindexed parameters</source> + <source>found {0} formatter</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="450"/> - <source>docstring does contain unindexed parameters</source> + <source>format string does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="453"/> - <source>other string does contain unindexed parameters</source> + <source>docstring does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="456"/> - <source>format call uses too large index ({0})</source> + <source>other string does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="459"/> - <source>format call uses missing keyword ({0})</source> + <source>format call uses too large index ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="462"/> - <source>format call uses keyword arguments but no named entries</source> + <source>format call uses missing keyword ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="465"/> - <source>format call uses variable arguments but no numbered entries</source> + <source>format call uses keyword arguments but no named entries</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="468"/> - <source>format call uses implicit and explicit indexes together</source> + <source>format call uses variable arguments but no numbered entries</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="471"/> - <source>format call provides unused index ({0})</source> + <source>format call uses implicit and explicit indexes together</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="474"/> - <source>format call provides unused keyword ({0})</source> + <source>format call provides unused index ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="477"/> - <source>expected these __future__ imports: {0}; but only got: {1}</source> + <source>format call provides unused keyword ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="480"/> - <source>expected these __future__ imports: {0}; but got none</source> + <source>expected these __future__ imports: {0}; but only got: {1}</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="483"/> - <source>print statement found</source> + <source>expected these __future__ imports: {0}; but got none</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="486"/> - <source>one element tuple found</source> + <source>print statement found</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="489"/> + <source>one element tuple found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="492"/> <source>{0}: {1}</source> <translation type="unfinished"></translation> </message> @@ -37377,72 +37686,72 @@ <context> <name>NamingStyleChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="378"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> <source>class names should use CapWords convention</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> - <source>function name should be lowercase</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="384"/> - <source>argument name should be lowercase</source> + <source>function name should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="387"/> - <source>first argument of a class method should be named 'cls'</source> + <source>argument name should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="390"/> - <source>first argument of a method should be named 'self'</source> + <source>first argument of a class method should be named 'cls'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="393"/> + <source>first argument of a method should be named 'self'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="396"/> <source>first argument of a static method should not be named 'self' or 'cls</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="397"/> - <source>module names should be lowercase</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="400"/> - <source>package names should be lowercase</source> + <source>module names should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="403"/> - <source>constant imported as non constant</source> + <source>package names should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="406"/> - <source>lowercase imported as non lowercase</source> + <source>constant imported as non constant</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="409"/> - <source>camelcase imported as lowercase</source> + <source>lowercase imported as non lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="412"/> - <source>camelcase imported as constant</source> + <source>camelcase imported as lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="415"/> - <source>variable in function should be lowercase</source> + <source>camelcase imported as constant</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="418"/> + <source>variable in function should be lowercase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="421"/> <source>names 'l', 'O' and 'I' should be avoided</source> <translation type="unfinished"></translation> </message> @@ -39847,27 +40156,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1525"/> + <location filename="../Preferences/__init__.py" line="1530"/> <source>Export Preferences</source> <translation>导出首选项</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1553"/> + <location filename="../Preferences/__init__.py" line="1558"/> <source>Import Preferences</source> <translation>导入首选项</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1553"/> + <location filename="../Preferences/__init__.py" line="1558"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>属性文件 (*.ini);;所有文件 (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1655"/> + <location filename="../Preferences/__init__.py" line="1660"/> <source>Select Python{0} Interpreter</source> <translation>选择 Python{0} 解释器</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1655"/> + <location filename="../Preferences/__init__.py" line="1660"/> <source>Select the Python{0} interpreter to be used:</source> <translation>选择要使用的 Python{0} 解释器：</translation> </message> @@ -39893,7 +40202,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="572"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="565"/> <source><p>ReStructuredText preview requires the <b>python-docutils</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pypi.python.org/pypi/docutils">this page.</a></p></source> <translation type="unfinished"></translation> </message> @@ -39903,8 +40212,8 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="597"/> - <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> + <location filename="../UI/Previewers/PreviewerHTML.py" line="590"/> + <source><p>Markdown preview requires the <b>python-markdown</b> package.<br/>Install it with your package manager, 'pip install docutils' or see <a href="http://pythonhosted.org/Markdown/install.html">installation instructions.</a></p></source> <translation type="unfinished"></translation> </message> </context> @@ -39931,17 +40240,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="177"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="179"/> <source><p>No preview available for this type of file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="225"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="230"/> <source>Preview - {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/Previewers/PreviewerHTML.py" line="227"/> + <location filename="../UI/Previewers/PreviewerHTML.py" line="232"/> <source>Preview</source> <translation>预览</translation> </message> @@ -44551,521 +44860,506 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/> - <source>Show log</source> - <translation>显示日志</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/> - <source>Show &log</source> - <translation>显示日志(&l)</translation> + <source>Show log browser</source> + <translation>显示日志浏览器</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> - <source>Show the log of the local project</source> - <translation>显示本地项目的日志</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation>显示对话框以浏览本地项目的日志</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="107"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation><b>显示日志</b><p>显示本地项目的日志。</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="114"/> - <source>Show log browser</source> - <translation>显示日志浏览器</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="119"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>显示对话框以浏览本地项目的日志</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/> + <translation type="obsolete"><b>显示日志</b><p>显示本地项目的日志。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="107"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>显示日志浏览器</b><p>显示对话框以浏览本地项目的日志。先显示的是一部分条目，稍后可以检索更多信息。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/> <source>Show differences</source> <translation>显示差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/> <source>Show &difference</source> <translation>显示差异(&d)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/> <source>Show the difference of the local project to the repository</source> <translation>显示本地项目与仓库的差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation><b>显示差异</b><p>显示本地项目与仓库之间的差异。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="132"/> <source>Show differences (extended)</source> <translation>显示差异（扩展）</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="137"/> <source>Show the difference of revisions of the project to the repository</source> <translation>显示项目的修订版本与仓库的差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="140"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/> <source>Show differences (URLs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="153"/> <source>Show the difference of the project between two repository URLs</source> <translation>显示两个仓库 URL 中项目的差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="156"/> <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/> + <source>Show status</source> + <translation>显示状态</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/> + <source>Show &status</source> + <translation>显示状态(&S)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> + <source>Show the status of the local project</source> + <translation>显示本地项目的状态</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="172"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation><b>显示状态</b><p>显示本地项目的状态。</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> - <source>Show status</source> - <translation>显示状态</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> - <source>Show &status</source> - <translation>显示状态(&S)</translation> + <source>Show change lists</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/> - <source>Show the status of the local project</source> - <translation>显示本地项目的状态</translation> + <source>Show the change lists and associated files of the local project</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="187"/> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation><b>显示状态</b><p>显示本地项目的状态。</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> - <source>Show change lists</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="199"/> - <source>Show the change lists and associated files of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="202"/> <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> <source>Show repository info</source> <translation>显示仓库信息</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="215"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="200"/> <source>Show some repository related information for the local project</source> <translation>显示本地项目的一些仓库相关信息</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="203"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation><b>显示仓库信息</b><p>显示本地项目的一些仓库相关信息。</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source>Tag in repository</source> + <translation>在仓库中标记</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source>&Tag in repository...</source> + <translation>在仓库中标记(&T)…</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="216"/> + <source>Tag the local project in the repository</source> + <translation>在仓库中标记本地项目</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>在仓库中标记</b><p>在仓库中标记本地项目。</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> - <source>Tag in repository</source> - <translation>在仓库中标记</translation> + <source>Export from repository</source> + <translation>从仓库导出</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> - <source>&Tag in repository...</source> - <translation>在仓库中标记(&T)…</translation> + <source>&Export from repository...</source> + <translation>从仓库导出(&E)…</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="231"/> - <source>Tag the local project in the repository</source> - <translation>在仓库中标记本地项目</translation> + <source>Export a project from the repository</source> + <translation>从仓库中导出一个项目</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>在仓库中标记</b><p>在仓库中标记本地项目。</p></translation> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>从仓库导出</b><p>从仓库导出一个项目。</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> - <source>Export from repository</source> - <translation>从仓库导出</translation> + <source>Command options</source> + <translation>命令选项</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> - <source>&Export from repository...</source> - <translation>从仓库导出(&E)…</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="246"/> - <source>Export a project from the repository</source> - <translation>从仓库中导出一个项目</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation><b>从仓库导出</b><p>从仓库导出一个项目。</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/> - <source>Command options</source> - <translation>命令选项</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/> <source>Command &options...</source> <translation>命令选项(&O)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Show the VCS command options</source> <translation>显示版本控制系统命令选项</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation><b>命令选项…</b><p>显示一个对话框以编辑版本控制系统命令选项。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/> + <source>Revert changes</source> + <translation type="unfinished">还原改变</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/> + <source>Re&vert changes</source> + <translation type="unfinished">还原改变(&v)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <source>Revert all changes made to the local project</source> + <translation type="unfinished">还原所有改变到本地项目中</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation><b>命令选项…</b><p>显示一个对话框以编辑版本控制系统命令选项。</p></translation> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation type="unfinished"><b>还原改变</b><p>还原所有改变到本地项目中。</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/> - <source>Revert changes</source> - <translation type="unfinished">还原改变</translation> + <source>Merge</source> + <translation>合并</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/> - <source>Re&vert changes</source> - <translation type="unfinished">还原改变(&v)</translation> + <source>Mer&ge changes...</source> + <translation>合并更改(&G)…</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> - <source>Revert all changes made to the local project</source> - <translation type="unfinished">还原所有改变到本地项目中</translation> + <source>Merge changes of a tag/revision into the local project</source> + <translation type="unfinished">将标签或修订本的改变合并到当前项目</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation type="unfinished"><b>还原改变</b><p>还原所有改变到本地项目中。</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/> - <source>Merge</source> - <translation>合并</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/> - <source>Mer&ge changes...</source> - <translation>合并更改(&G)…</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="289"/> - <source>Merge changes of a tag/revision into the local project</source> - <translation type="unfinished">将标签或修订本的改变合并到当前项目</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation type="unfinished"><b>合并</b><p>将标签或修订本的改变合并到当前项目。</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/> + <source>Switch</source> + <translation type="unfinished">转换</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/> + <source>S&witch...</source> + <translation type="unfinished">转换(&w)…</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <source>Switch the local copy to another tag/branch</source> + <translation type="unfinished">转换本地副本到另一个标签或分支</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> + <translation type="unfinished"><b>转换</b><p>转换本地副本到另一个标签或分支。</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>Switch</source> - <translation type="unfinished">转换</translation> + <source>Conflicts resolved</source> + <translation type="unfinished">冲突已解决</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>S&witch...</source> - <translation type="unfinished">转换(&w)…</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> - <source>Switch the local copy to another tag/branch</source> - <translation type="unfinished">转换本地副本到另一个标签或分支</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> - <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> - <translation type="unfinished"><b>转换</b><p>转换本地副本到另一个标签或分支。</p></translation> + <source>Con&flicts resolved</source> + <translation type="unfinished">冲突已解决(&F)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="304"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished">将本地项目的所有冲突标记为已解决状态</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="307"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"><b>冲突已解决</b><p>将本地项目中的所有冲突标记为已解决。</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> - <source>Conflicts resolved</source> - <translation type="unfinished">冲突已解决</translation> + <source>Cleanup</source> + <translation type="unfinished">清除</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> - <source>Con&flicts resolved</source> - <translation type="unfinished">冲突已解决(&F)</translation> + <source>Cleanu&p</source> + <translation type="unfinished">清除(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished">将本地项目的所有冲突标记为已解决状态</translation> + <source>Cleanup the local project</source> + <translation type="unfinished">清除本地项目</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="322"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation type="unfinished"><b>冲突已解决</b><p>将本地项目中的所有冲突标记为已解决。</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/> - <source>Cleanup</source> - <translation type="unfinished">清除</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/> - <source>Cleanu&p</source> - <translation type="unfinished">清除(&P)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> - <source>Cleanup the local project</source> - <translation type="unfinished">清除本地项目</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="337"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation type="unfinished"><b>清除</b><p>执行对本地项目的清除。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>Execute command</source> <translation type="unfinished">执行命令</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>E&xecute command...</source> <translation>执行命令(&X)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="333"/> <source>Execute an arbitrary VCS command</source> <translation>执行任意的版本控制系统命令</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="336"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation><b>执行命令</b><p>打开一个对话框以输入任意一个版本控制系统命令。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/> <source>List tags</source> <translation type="unfinished">列出标签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/> <source>List tags...</source> <translation type="unfinished">列出标签…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> <source>List tags of the project</source> <translation type="unfinished">列出项目的标签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="350"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"><b>列出标签</b><p>列出项目的标签。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches</source> <translation>列出分支</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches...</source> <translation>列出分支…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="361"/> <source>List branches of the project</source> <translation>列出项目的分支</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="364"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>列出分支</b><p>列出项目的分支。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source>List repository contents</source> <translation>列出仓库内容</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source>List repository contents...</source> <translation>列出仓库内容…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="375"/> <source>Lists the contents of the repository</source> <translation>列出仓库的内容</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation><b>列出仓库内容</b><p>列出仓库的内容。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/> <source>Set Property</source> <translation>设置属性</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/> <source>Set Property...</source> <translation>设置属性…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="389"/> <source>Set a property for the project files</source> <translation>为项目文件设置一个属性</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="392"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation><b>设置属性</b><p>为项目文件设置一个属性。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source>List Properties</source> <translation>列出属性</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source>List Properties...</source> <translation>列出属性…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="403"/> <source>List properties of the project files</source> <translation>列出项目文件的属性</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation><b>列出属性</b><p>列出项目文件的属性。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/> <source>Delete Property</source> <translation>删除属性</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/> <source>Delete Property...</source> <translation>删除属性…</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> + <source>Delete a property for the project files</source> + <translation>从项目文件中删除一个属性</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="420"/> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation><b>删除属性</b><p>从项目文件中删除一个属性。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/> + <source>Relocate</source> + <translation>重定位</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/> + <source>Relocate...</source> + <translation>重定位…</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> - <source>Delete a property for the project files</source> - <translation>从项目文件中删除一个属性</translation> + <source>Relocate the working copy to a new repository URL</source> + <translation type="unfinished">将工作副本重定位到一个新的仓库 URL</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation><b>删除属性</b><p>从项目文件中删除一个属性。</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/> - <source>Relocate</source> - <translation>重定位</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/> - <source>Relocate...</source> - <translation>重定位…</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> - <source>Relocate the working copy to a new repository URL</source> - <translation type="unfinished">将工作副本重定位到一个新的仓库 URL</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation type="unfinished"><b>重定位</b><p>将工作副本重定位到一个新的仓库 URL 。</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/> + <source>Repository Browser</source> + <translation>仓库浏览器</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/> + <source>Repository Browser...</source> + <translation>仓库浏览器…</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> + <source>Show the Repository Browser dialog</source> + <translation>显示仓库浏览器对话框</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation><b>仓库浏览器</b><p>显示仓库浏览器对话框。</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> - <source>Repository Browser</source> - <translation>仓库浏览器</translation> + <source>Configure</source> + <translation>配置</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> - <source>Repository Browser...</source> - <translation>仓库浏览器…</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="463"/> - <source>Show the Repository Browser dialog</source> - <translation>显示仓库浏览器对话框</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="466"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation><b>仓库浏览器</b><p>显示仓库浏览器对话框。</p></translation> + <source>Configure...</source> + <translation>配置…</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="462"/> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation>显示配置对话框并自动选择 Subversion 页面</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="465"/> + <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> + <translation><b>配置</b><p>显示配置对话框并自动选择 Subversion 页面。</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/> - <source>Configure</source> - <translation>配置</translation> + <source>Upgrade</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/> - <source>Configure...</source> - <translation>配置…</translation> + <source>Upgrade...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="477"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation>显示配置对话框并自动选择 Subversion 页面</translation> + <source>Upgrade the working copy to the current format</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="480"/> - <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> - <translation><b>配置</b><p>显示配置对话框并自动选择 Subversion 页面。</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/> - <source>Upgrade</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/> - <source>Upgrade...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="492"/> - <source>Upgrade the working copy to the current format</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="495"/> <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="559"/> <source>Subversion (pysvn)</source> <translation>Subversion（pysvn）</translation> </message> @@ -48133,12 +48427,12 @@ <translation type="unfinished">添加…</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="58"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="68"/> <source>Remove</source> <translation type="unfinished">移除</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="117"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="132"/> <source>Add Documentation</source> <translation type="unfinished"></translation> </message> @@ -48148,7 +48442,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="152"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="167"/> <source>Remove Documentation</source> <translation type="unfinished"></translation> </message> @@ -48158,40 +48452,50 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="55"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="65"/> <source>Press to remove the selected documents from the database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="137"/> - <source>Do you really want to remove the selected documentation sets from the database?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="107"/> - <source>The file <b>{0}</b> is not a valid Qt Help File.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="117"/> - <source>The namespace <b>{0}</b> is already registered.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="152"/> + <source>Do you really want to remove the selected documentation sets from the database?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="122"/> + <source>The file <b>{0}</b> is not a valid Qt Help File.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="132"/> + <source>The namespace <b>{0}</b> is already registered.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.py" line="167"/> <source>Some documents currently opened reference the documentation you are attempting to remove. Removing the documentation will close those documents. Remove anyway?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="78"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="55"/> <source>Press to select QtHelp documents provided by a plug-in to add to the database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="81"/> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="58"/> <source>Add from Plug-ins...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="85"/> + <source>Select to manage the plug-in provided documentation sets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationDialog.ui" line="88"/> + <source>Manage Plug-ins...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QtHelpDocumentationSelectionDialog</name> @@ -48205,6 +48509,61 @@ <source>Select the documentation files to be installed:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="144"/> + <source>Delete Documentation Sets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="91"/> + <source>Shall the selected documentation sets really be deleted?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="107"/> + <source><p>The documentation set <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="126"/> + <source>Shall the selected documentation set categories really be deleted?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py" line="144"/> + <source>Shall all documentation sets really be deleted?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="56"/> + <source>Press to delete the selected documentation sets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="59"/> + <source>Delete</source> + <translation type="unfinished">删除</translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="66"/> + <source>Press to delete the selected category</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="69"/> + <source>Delete Categories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="76"/> + <source>Press to delete all entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.ui" line="79"/> + <source>Delete All</source> + <translation type="unfinished">全部删除</translation> + </message> </context> <context> <name>QtHelpFiltersDialog</name> @@ -49477,6 +49836,19 @@ </message> </context> <context> + <name>RestructuredTextProvider</name> + <message> + <location filename="../QScintilla/MarkupProviders/RestructuredTextProvider.py" line="411"/> + <source>Create List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/MarkupProviders/RestructuredTextProvider.py" line="411"/> + <source>Enter desired number of list elements:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>SafariImporter</name> <message> <location filename="../WebBrowser/Bookmarks/BookmarksImporters/SafariImporter.py" line="44"/> @@ -52561,7 +52933,7 @@ <context> <name>Subversion</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1984"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1964"/> <source>The svn process did not finish within 30s.</source> <translation>svn 进程在 30 秒内未结束。</translation> </message> @@ -52646,132 +53018,132 @@ <translation>从Subversion 仓库移除文件或文件夹</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/> <source>Subversion Error</source> <translation>Subversion 错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="951"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>项目仓库的 URL 无法从工作拷贝中获取。标签操作将被终止</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="998"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="978"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>项目仓库的 URL 包含无效格式。标签操作将被终止</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1056"/> <source>Reverting changes</source> <translation>还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1093"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1073"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>项目仓库的 URL 无法从工作拷贝中检索。转换操作将被终止</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>项目仓库的 URL 包含无效格式。转换操作将被终止</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1512"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1492"/> <source>Subversion command</source> <translation>Subversion 命令</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1684"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1664"/> <source>Resolving conficts</source> <translation>解析冲突</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1779"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1759"/> <source>Subversion Set Property</source> <translation>Subversion 设置属性</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1781"/> + <source>You have to supply a property name. Aborting.</source> + <translation>您必须提供一个属性名。终止。</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1801"/> - <source>You have to supply a property name. Aborting.</source> - <translation>您必须提供一个属性名。终止。</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1821"/> <source>Subversion Delete Property</source> <translation>Subversion 删除属性</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1791"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1771"/> <source>Enter property name</source> <translation>输入属性名</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> <source>Subversion Log</source> - <translation>Subversion 日志</translation> + <translation type="obsolete">Subversion 日志</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> <source>Select number of entries to show.</source> - <translation>选择要显示的条目数。</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2100"/> + <translation type="obsolete">选择要显示的条目数。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2080"/> <source>Locking in the Subversion repository</source> <translation>在 Subversion 仓库中锁定</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2108"/> <source>Unlocking in the Subversion repository</source> <translation>在 Subversion 仓库中解锁</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2153"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2133"/> <source>Relocating</source> <translation>重新定位</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/> <source>Repository Browser</source> <translation>仓库浏览器</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/> <source>Enter the repository URL.</source> <translation>输入仓库 URL。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2221"/> <source>Remove from changelist</source> <translation>从更改列表中移除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/> <source>Add to changelist</source> <translation>添加更改列表</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/> <source>Enter name of the changelist:</source> <translation>输入更改列表名称：</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1923"/> <source>Property set.</source> <translation>属性设置。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1997"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1976"/> <source>Property deleted.</source> <translation>属性已删除。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/> <source>Subversion Lock</source> <translation>Subversion 锁定</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/> <source>Enter lock comment</source> <translation>输入锁定注释</translation> </message> @@ -52951,27 +53323,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1033"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1013"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1151"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1131"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1196"/> <source>Merging {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1482"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1462"/> <source>Cleaning up {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1695"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -52987,7 +53359,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1255"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1234"/> <source>Revision {0}. </source> <translation type="unfinished">版本 {0}。 @@ -53004,37 +53376,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/> <source>Revert changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1042"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1987"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1967"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/> <source>Subversion Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>文件 <b>{0}</b> 无法读取。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2305"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2285"/> <source>Upgrade</source> <translation type="unfinished"></translation> </message> @@ -53942,17 +54314,17 @@ <translation>选择要过滤的区域</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="661"/> <source>Revision</source> <translation>修订</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="658"/> <source>Author</source> <translation>作者</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="165"/> <source>Message</source> <translation>消息</translation> </message> @@ -54012,256 +54384,251 @@ <translation>复制或移动时停止</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="261"/> <source>Press to generate a diff to the previous revision</source> <translation>点击生成与上一次修订的差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="264"/> <source>&Diff to Previous</source> <translation>与上一次的差异(&D)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="271"/> <source>Press to compare two revisions</source> <translation>点击比较两次修订</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> <source>&Compare Revisions</source> <translation>比较修订(&C)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="312"/> <source>Errors</source> <translation>错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="318"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> <translation><b>Subversion 日志错误</b><p>显示 svn log 命令可能的错误消息。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="334"/> <source>Input</source> <translation>输入</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="336"/> - <source>Press to send the input to the subversion process</source> - <translation>点击将输入发送到 subversion 进程</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/> - <source>&Send</source> - <translation>发送(&S)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="349"/> - <source>Enter data to be sent to the subversion process</source> - <translation>输入要发送到 subversion 进程的数据</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> - <source>Select to switch the input field to password mode</source> - <translation>选择将输入区域转换成密码模式</translation> + <source>Press to send the input to the subversion process</source> + <translation>点击将输入发送到 subversion 进程</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> - <source>&Password Mode</source> - <translation>密码模式(&P)</translation> + <source>&Send</source> + <translation>发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="369"/> + <source>Enter data to be sent to the subversion process</source> + <translation>输入要发送到 subversion 进程的数据</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="376"/> + <source>Select to switch the input field to password mode</source> + <translation>选择将输入区域转换成密码模式</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="379"/> + <source>&Password Mode</source> + <translation>密码模式(&P)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="382"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="89"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="93"/> <source>Added</source> <translation>已添加</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="90"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="94"/> <source>Deleted</source> <translation>已删除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="91"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="95"/> <source>Modified</source> <translation>已修改</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="504"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="527"/> <source>Subversion Error</source> <translation>Subversion 错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="313"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="313"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="96"/> <source>Replaced</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="294"/> <source>Select to show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="297"/> <source>Show differences side-by-side</source> <translation>并排显示差异</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <source>Press to move up in the log list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <source>Press to move down in the log list</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnLogDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="14"/> <source>Subversion Log</source> - <translation>Subversion 日志</translation> + <translation type="obsolete">Subversion 日志</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="26"/> <source>Log</source> - <translation>日志</translation> + <translation type="obsolete">日志</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="32"/> <source><b>Subversion Log</b><p>This shows the output of the svn log command. By clicking on the links you may show the difference between versions.</p></source> - <translation><b>Subversion 日志</b><p>显示 svn log 命令的输出。在链接上点击可以显示版本间的差异。</p></translation> + <translation type="obsolete"><b>Subversion 日志</b><p>显示 svn log 命令的输出。在链接上点击可以显示版本间的差异。</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="58"/> <source>Errors</source> - <translation>错误</translation> + <translation type="obsolete">错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="64"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> - <translation><b> Subversion 日志错误</b><p>显示 svn log 命令可能的错误消息。</p></translation> + <translation type="obsolete"><b> Subversion 日志错误</b><p>显示 svn log 命令可能的错误消息。</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="80"/> <source>Input</source> - <translation>输入</translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="102"/> <source>Press to send the input to the subversion process</source> - <translation type="unfinished">点击将输入发送到 subversion 进程</translation> + <translation type="obsolete">点击将输入发送到 subversion 进程</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="105"/> <source>&Send</source> - <translation>发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="108"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="115"/> <source>Enter data to be sent to the subversion process</source> - <translation>输入要发送到 subversion 进程的数据</translation> + <translation type="obsolete">输入要发送到 subversion 进程的数据</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="122"/> <source>Select to switch the input field to password mode</source> - <translation>选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="125"/> <source>&Password Mode</source> - <translation>密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="128"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="55"/> <source><b>Processing your request, please wait...</b></source> - <translation><b>正在处理您的请求，请稍候…</b></translation> + <translation type="obsolete"><b>正在处理您的请求，请稍候…</b></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="81"/> <source>Added</source> - <translation>已添加</translation> + <translation type="obsolete">已添加</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="82"/> <source>Deleted</source> - <translation>已删除</translation> + <translation type="obsolete">已删除</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="83"/> <source>Modified</source> - <translation>已修改</translation> + <translation type="obsolete">已修改</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="87"/> <source>revision</source> - <translation>修订</translation> + <translation type="obsolete">修订</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> <source>Process Generation Error</source> - <translation>进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation>进程 {0} 无法启动。请保证它处在搜索路径中。</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="193"/> - <source>diff to {0}</source> - <translation type="unfinished"></translation> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="202"/> <source><i>author: {0}</i><br /> </source> - <translation><i>作者：{0}</i><br /> + <translation type="obsolete"><i>作者：{0}</i><br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="205"/> <source><i>date: {0}</i><br /> </source> - <translation><i>日期：{0}</i><br /> + <translation type="obsolete"><i>日期：{0}</i><br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="191"/> - <source> (copied from {0}, revision {1})</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="42"/> - <source>Select to show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="45"/> <source>Show differences side-by-side</source> - <translation type="unfinished">并排显示差异</translation> + <translation type="obsolete">并排显示差异</translation> </message> </context> <context> @@ -54578,177 +54945,177 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="634"/> <source>Version Control</source> <translation>版本控制</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="654"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="646"/> <source>Update from repository</source> <translation>从仓库更新</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="658"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="650"/> <source>Commit changes to repository...</source> <translation>将更改提交到仓库中…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="656"/> <source>Add to repository</source> <translation>添加到仓库</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="385"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="381"/> <source>Add tree to repository</source> <translation>添加树到仓库</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="660"/> <source>Remove from repository (and disk)</source> <translation>从仓库（和磁盘）中移除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="667"/> <source>Add to Changelist</source> <translation>添加更改列表</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="679"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="671"/> <source>Remove from Changelist</source> <translation>从更改列表中移除</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="566"/> <source>Show log</source> - <translation>显示日志</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="570"/> + <translation type="obsolete">显示日志</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="562"/> <source>Show log browser</source> <translation>显示日志浏览器</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="684"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="676"/> <source>Show status</source> <translation>显示状态</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="286"/> <source>Show annotated file</source> <translation>显示有注释的文件</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="696"/> <source>Revert changes</source> <translation>还原改变</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="700"/> + <source>Merge changes</source> + <translation>合并更改</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="430"/> + <source>Lock</source> + <translation>闭锁</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="434"/> + <source>Unlock</source> + <translation>解锁</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="438"/> + <source>Break Lock</source> + <translation>Break Lock</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="442"/> + <source>Steal Lock</source> + <translation>Steal Lock</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="708"/> - <source>Merge changes</source> - <translation>合并更改</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="434"/> - <source>Lock</source> - <translation>闭锁</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="438"/> - <source>Unlock</source> - <translation>解锁</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="442"/> - <source>Break Lock</source> - <translation>Break Lock</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="446"/> - <source>Steal Lock</source> - <translation>Steal Lock</translation> + <source>Set Property</source> + <translation>设置属性</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="710"/> + <source>List Properties</source> + <translation>列出属性</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="713"/> + <source>Delete Property</source> + <translation>删除属性</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="716"/> - <source>Set Property</source> - <translation>设置属性</translation> + <source>Select all local file entries</source> + <translation>选择所有本地文件条目</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="718"/> - <source>List Properties</source> - <translation>列出属性</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="721"/> - <source>Delete Property</source> - <translation>删除属性</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="724"/> - <source>Select all local file entries</source> - <translation>选择所有本地文件条目</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="726"/> <source>Select all versioned file entries</source> <translation>选择所有版本化的文件条目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="720"/> <source>Select all local directory entries</source> <translation>选择所有本地文件夹条目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="730"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="722"/> <source>Select all versioned directory entries</source> <translation>选择所有版本化的文件夹条目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="733"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="725"/> <source>Configure...</source> <translation>配置…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="572"/> <source>Show repository info</source> <translation>显示仓库信息</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="547"/> <source>Copy</source> <translation>复制</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="549"/> <source>Move</source> <translation>移动</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="681"/> <source>Show differences</source> <translation>显示差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="271"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="267"/> <source>Show differences side-by-side</source> <translation>并排显示差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="693"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="685"/> <source>Show differences (extended)</source> <translation>显示差异（扩展）</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="276"/> <source>Show differences side-by-side (extended)</source> <translation>并排显示差异（扩展）</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="698"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="690"/> <source>Show differences (URLs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="712"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/> <source>Conflicts resolved</source> <translation>冲突已解决</translation> </message> @@ -54817,416 +55184,401 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/> - <source>Show log</source> - <translation>显示日志</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/> - <source>Show &log</source> - <translation>显示日志(&l)</translation> + <source>Show log browser</source> + <translation>显示日志浏览器</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="104"/> - <source>Show the log of the local project</source> - <translation>显示本地项目的日志</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation>显示对话框以浏览本地项目的日志</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="107"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation><b>显示日志</b><p>显示本地项目的日志。</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="114"/> - <source>Show log browser</source> - <translation>显示日志浏览器</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="119"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>显示对话框以浏览本地项目的日志</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="122"/> + <translation type="obsolete"><b>显示日志</b><p>显示本地项目的日志。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="107"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>显示日志浏览器</b><p>显示对话框以浏览本地项目的日志。先显示一部分条目，稍后可以检索更多信息。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/> <source>Show &difference</source> <translation>显示差异(&D)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="121"/> <source>Show the difference of the local project to the repository</source> <translation>显示本地项目与仓库的差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="137"/> <source>Show the difference of revisions of the project to the repository</source> <translation>显示项目的修订本与仓库的差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="153"/> <source>Show the difference of the project between two repository URLs</source> <translation>显示两个仓库 URL 中项目的差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="164"/> <source>Show status</source> <translation>显示状态</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="164"/> <source>Show &status</source> <translation>显示状态(&S)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="169"/> <source>Show the status of the local project</source> <translation>显示本地项目的状态</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="172"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>显示状态</b><p>显示本地项目的状态。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="195"/> <source>Tag in repository</source> <translation>在仓库中标记</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="195"/> + <source>&Tag in repository...</source> + <translation>在仓库中标记(&T)…</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="200"/> + <source>Tag the local project in the repository</source> + <translation>在仓库中标记本地项目</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="203"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>在仓库中标记</b><p>在仓库中标记本地项目。</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="210"/> - <source>&Tag in repository...</source> - <translation>在仓库中标记(&T)…</translation> + <source>Export from repository</source> + <translation>从仓库导出</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="210"/> + <source>&Export from repository...</source> + <translation>从仓库导出(&E)…</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="215"/> - <source>Tag the local project in the repository</source> - <translation>在仓库中标记本地项目</translation> + <source>Export a project from the repository</source> + <translation>从仓库中导出一个项目</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="218"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>在仓库中标记</b><p>在仓库中标记本地项目。</p></translation> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>从仓库导出</b><p>从仓库导出一个项目。</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/> - <source>Export from repository</source> - <translation>从仓库导出</translation> + <source>Command options</source> + <translation>命令选项</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="225"/> - <source>&Export from repository...</source> - <translation>从仓库导出(&E)…</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="230"/> - <source>Export a project from the repository</source> - <translation>从仓库中导出一个项目</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="233"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation><b>从仓库导出</b><p>从仓库导出一个项目。</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="240"/> - <source>Command options</source> - <translation>命令选项</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="240"/> <source>Command &options...</source> <translation>命令选项(&o)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="229"/> <source>Show the VCS command options</source> <translation>显示版本控制系统命令选项</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="231"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation><b>命令选项…</b><p>显示一个对话框以编辑版本控制系统命令选项。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="238"/> + <source>Revert changes</source> + <translation>还原改变</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="238"/> + <source>Re&vert changes</source> + <translation>还原改变(&v)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="243"/> + <source>Revert all changes made to the local project</source> + <translation>还原所有改变到本地项目中</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="246"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation><b>命令选项…</b><p>显示一个对话框以编辑版本控制系统命令选项。</p></translation> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation><b>还原改变</b><p>还原所有改变到本地项目中。</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/> - <source>Revert changes</source> - <translation>还原改变</translation> + <source>Merge</source> + <translation>合并</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="253"/> - <source>Re&vert changes</source> - <translation>还原改变(&v)</translation> + <source>Mer&ge changes...</source> + <translation>合并更改(&g)…</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="258"/> - <source>Revert all changes made to the local project</source> - <translation>还原所有改变到本地项目中</translation> + <source>Merge changes of a tag/revision into the local project</source> + <translation>将标签或修订本的改变合并到当前项目</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="261"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation><b>还原改变</b><p>还原所有改变到本地项目中。</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="268"/> - <source>Merge</source> - <translation>合并</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="268"/> - <source>Mer&ge changes...</source> - <translation>合并更改(&g)…</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="273"/> - <source>Merge changes of a tag/revision into the local project</source> - <translation>将标签或修订本的改变合并到当前项目</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="276"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>合并</b><p>将标签或修订本的改变合并到当前项目。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="269"/> <source>Switch</source> <translation>转换</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="269"/> <source>S&witch...</source> <translation>转换(&w)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="274"/> <source>Switch the local copy to another tag/branch</source> <translation>转换本地副本到另一个标签或分支</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="277"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>转换</b><p>转换本地副本到另一个标签或分支。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> <source>Cleanup</source> <translation>清除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> <source>Cleanu&p</source> <translation>清除(&P)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="303"/> <source>Cleanup the local project</source> <translation>清除本地项目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="306"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>清除</b><p>执行对本地项目的清除。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="328"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="313"/> <source>Execute command</source> <translation>执行命令</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="328"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="313"/> <source>E&xecute command...</source> <translation>执行命令(&X)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="317"/> <source>Execute an arbitrary VCS command</source> <translation>执行任意的版本控制系统命令</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="320"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation><b>执行命令</b><p>打开一个对话框以输入任意一个版本控制系统命令。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="327"/> <source>List tags</source> <translation>列出标签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="327"/> <source>List tags...</source> <translation>列出标签…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="331"/> <source>List tags of the project</source> <translation>列出项目的标签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="334"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>列出标签</b><p>列出项目的标签。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="341"/> <source>List branches</source> <translation>列出分支</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="341"/> <source>List branches...</source> <translation>列出分支…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="345"/> <source>List branches of the project</source> <translation>列出项目的分支</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="348"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>列出分支</b><p>列出项目的分支。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="355"/> <source>List repository contents</source> <translation>列出仓库内容</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="355"/> <source>List repository contents...</source> <translation>列出仓库内容…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="374"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="359"/> <source>Lists the contents of the repository</source> <translation>列出仓库的内容</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="377"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="362"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation><b>列出仓库内容</b><p>列出仓库的内容。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="369"/> <source>Set Property</source> <translation>设置属性</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="369"/> <source>Set Property...</source> <translation>设置属性…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="373"/> <source>Set a property for the project files</source> <translation>为项目文件设置一个属性</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="376"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation><b>设置属性</b><p>为项目文件设置一个属性。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="383"/> <source>List Properties</source> <translation>列出属性</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="383"/> <source>List Properties...</source> <translation>列出属性…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="387"/> <source>List properties of the project files</source> <translation>列出项目文件的属性</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="390"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation><b>列出属性</b><p>列出项目文件的属性。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="397"/> <source>Delete Property</source> <translation>删除属性</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="397"/> <source>Delete Property...</source> <translation>删除属性…</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="401"/> + <source>Delete a property for the project files</source> + <translation>从项目文件中删除一个属性</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="404"/> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation><b>删除属性</b><p>从项目文件中删除一个属性。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/> + <source>Relocate</source> + <translation>重定位</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="411"/> + <source>Relocate...</source> + <translation>重定位…</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="416"/> - <source>Delete a property for the project files</source> - <translation>从项目文件中删除一个属性</translation> + <source>Relocate the working copy to a new repository URL</source> + <translation>将工作副本重定位到一个新的储存库 URL</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="419"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation><b>删除属性</b><p>从项目文件中删除一个属性。</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="426"/> - <source>Relocate</source> - <translation>重定位</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="426"/> - <source>Relocate...</source> - <translation>重定位…</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="431"/> - <source>Relocate the working copy to a new repository URL</source> - <translation>将工作副本重定位到一个新的储存库 URL</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="434"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>重定位</b><p>将工作副本重定位到一个新的储存库 URL 。</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="427"/> + <source>Repository Browser</source> + <translation>仓库浏览器</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="427"/> + <source>Repository Browser...</source> + <translation>仓库浏览器…</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="432"/> + <source>Show the Repository Browser dialog</source> + <translation>显示仓库浏览器对话框</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="435"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation><b>仓库浏览器</b><p>显示仓库浏览器对话框。</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> - <source>Repository Browser</source> - <translation>仓库浏览器</translation> + <source>Configure</source> + <translation>配置</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="442"/> - <source>Repository Browser...</source> - <translation>仓库浏览器…</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="447"/> - <source>Show the Repository Browser dialog</source> - <translation>显示仓库浏览器对话框</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="450"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation><b>仓库浏览器</b><p>显示仓库浏览器对话框。</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> - <source>Configure</source> - <translation>配置</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> <source>Configure...</source> <translation>配置…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="461"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="446"/> <source>Show the configuration dialog with the Subversion page selected</source> <translation>显示配置对话框并自动选择 subversion 页面</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="464"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="449"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation><b>配置</b><p>显示配置对话框并自动选择 subversion 页面。</p></translation> </message> @@ -55246,92 +55598,92 @@ <translation type="obsolete"><b>显示储存库信息</b><p>显示本地项目的一些储存库相关信息。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> <source>Conflicts resolved</source> <translation>冲突已解决</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="299"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="284"/> <source>Con&flicts resolved</source> <translation>冲突已解决(&F)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="288"/> <source>Mark all conflicts of the local project as resolved</source> <translation>将本地项目的所有冲突标记为已解决状态</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="291"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation><b>冲突已解决</b><p>将本地项目中的所有冲突标记为已解决。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="179"/> <source>Show change lists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="184"/> <source>Show the change lists and associated files of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="202"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="187"/> <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> <source>Upgrade</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="457"/> <source>Upgrade...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="476"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="461"/> <source>Upgrade the working copy to the current format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="479"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="464"/> <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="116"/> <source>Show differences</source> <translation>显示差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="132"/> <source>Show differences (extended)</source> <translation>显示差异（扩展）</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="148"/> <source>Show differences (URLs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="124"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"><b>显示差异</b><p>显示本地项目与仓库之间的差异。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="140"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="156"/> <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="559"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="543"/> <source>Subversion (svn)</source> <translation>Subversion（svn）</translation> </message> @@ -59617,22 +59969,22 @@ <translation>全部</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="66"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="62"/> <source>Language:</source> <translation>语言：</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="70"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="69"/> <source>GROUP</source> <translation>组</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="103"/> <source>Close dialog</source> <translation>关闭对话框</translation> </message> <message> - <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/> + <location filename="../Templates/TemplatePropertiesDialog.py" line="103"/> <source>Do you really want to close the dialog?</source> <translation>确定要关闭对话框？</translation> </message> @@ -61328,7 +61680,7 @@ <context> <name>UnittestDialog</name> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.py" line="403"/> <source>Unittest</source> <translation>单元测试</translation> </message> @@ -61519,57 +61871,57 @@ <translation>^错误：</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="266"/> + <location filename="../PyUnit/UnittestDialog.py" line="269"/> <source>You must enter a test suite file.</source> <translation>必须输入测试套件文件。</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="274"/> + <location filename="../PyUnit/UnittestDialog.py" line="277"/> <source>Preparing Testsuite</source> <translation>准备测试套件</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="469"/> + <location filename="../PyUnit/UnittestDialog.py" line="475"/> <source>Running</source> <translation>正在运行</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="634"/> + <location filename="../PyUnit/UnittestDialog.py" line="640"/> <source>Show Source</source> <translation>显示源代码</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="206"/> + <location filename="../PyUnit/UnittestDialog.py" line="209"/> <source>Python Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="202"/> + <location filename="../PyUnit/UnittestDialog.py" line="205"/> <source>Python3 Files ({1});;Python2 Files ({0});;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.py" line="403"/> <source><p>Unable to run test <b>{0}</b>.<br>{1}<br>{2}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="493"/> + <location filename="../PyUnit/UnittestDialog.py" line="499"/> <source>Ran {0} test in {1:.3f}s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="497"/> + <location filename="../PyUnit/UnittestDialog.py" line="503"/> <source>Ran {0} tests in {1:.3f}s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="514"/> + <location filename="../PyUnit/UnittestDialog.py" line="520"/> <source>Failure: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="529"/> + <location filename="../PyUnit/UnittestDialog.py" line="535"/> <source>Error: {0}</source> <translation type="unfinished">错误：{0}</translation> </message> @@ -61604,17 +61956,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="544"/> + <location filename="../PyUnit/UnittestDialog.py" line="550"/> <source> Skipped: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="559"/> + <location filename="../PyUnit/UnittestDialog.py" line="565"/> <source> Expected Failure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="573"/> + <location filename="../PyUnit/UnittestDialog.py" line="579"/> <source> Unexpected Success</source> <translation type="unfinished"></translation> </message> @@ -63995,7 +64347,7 @@ <context> <name>Utilities</name> <message> - <location filename="../Utilities/__init__.py" line="1400"/> + <location filename="../Utilities/__init__.py" line="1403"/> <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> @@ -64215,13 +64567,13 @@ </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="38"/> - <source>&Locals Filter</source> - <translation>局部过滤(&L)</translation> + <source>&Locals Viewer</source> + <translation type="unfinished">局部过滤(&L)</translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="48"/> - <source>&Globals Filter</source> - <translation>全局过滤(&G)</translation> + <source>&Globals Viewer</source> + <translation type="unfinished">全局过滤(&G)</translation> </message> <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="58"/> @@ -64231,8 +64583,8 @@ <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="61"/> <source><b>Locals Filter List</b> -<p>Select the variable types you want to be filtered out of the locals variables list.</p<</source> - <translation><b>局部过滤列表</b> +<p>Select the variable types you want to be shown in the local variables viewer.</p<</source> + <translation type="unfinished"><b>局部过滤列表</b> <p>选择想要从局部变量列表中过滤的变量类型。</p></translation> </message> <message> @@ -64243,8 +64595,8 @@ <message> <location filename="../Debugger/VariablesFilterDialog.ui" line="81"/> <source><b>Globals Filter List</b> -<p>Select the variable types you want to be filtered out of the globals variables list.</p<</source> - <translation><b>全局过滤列表</b> +<p>Select the variable types you want to be shown in the global variables viewer.</p<</source> + <translation type="unfinished"><b>全局过滤列表</b> <p>选择想要从全部变量列表中过滤的变量类型。</p></translation> </message> <message> @@ -64252,6 +64604,11 @@ <source>Save Default</source> <translation>保存默认值</translation> </message> + <message> + <location filename="../Debugger/VariablesFilterDialog.ui" line="28"/> + <source>Select the variable types to be shown in the variables viewers:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VariablesViewer</name> @@ -64827,7 +65184,7 @@ <translation>更新</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="532"/> + <location filename="../VCS/ProjectHelper.py" line="533"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -64842,7 +65199,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="532"/> + <location filename="../VCS/ProjectHelper.py" line="533"/> <source>Switch</source> <translation type="unfinished">转换</translation> </message> @@ -64922,17 +65279,17 @@ <context> <name>VersionControl</name> <message> - <location filename="../VCS/VersionControl.py" line="573"/> + <location filename="../VCS/VersionControl.py" line="563"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> <message> - <location filename="../VCS/VersionControl.py" line="704"/> + <location filename="../VCS/VersionControl.py" line="694"/> <source>Repository status checking is switched off</source> <translation>储存库状态检查被关闭</translation> </message> <message> - <location filename="../VCS/VersionControl.py" line="573"/> + <location filename="../VCS/VersionControl.py" line="563"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> @@ -72191,46 +72548,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1459"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1426"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1446"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -72238,12 +72595,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -72254,13 +72611,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2078"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2083"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> @@ -72767,50 +73124,55 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="240"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="243"/> <source>do not assign a lambda expression, use a def</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="243"/> - <source>ambiguous variable name '{0}'</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="246"/> - <source>ambiguous class definition '{0}'</source> + <source>ambiguous variable name '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="249"/> - <source>ambiguous function definition '{0}'</source> + <source>ambiguous class definition '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="252"/> - <source>{0}: {1}</source> + <source>ambiguous function definition '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="255"/> + <source>{0}: {1}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="258"/> <source>{0}</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="240"/> + <source>do not use bare except</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>subversion</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1741"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1720"/> <source>unknown</source> <translation>未知</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1606"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1586"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1746"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1725"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation type="unfinished"></translation> </message>
diff -r 852016bbdedb -r c307358a2ecc icons/default/formatTextBold.png Binary file icons/default/formatTextBold.png has changed
diff -r 852016bbdedb -r c307358a2ecc icons/default/formatTextBulletedList.png Binary file icons/default/formatTextBulletedList.png has changed
diff -r 852016bbdedb -r c307358a2ecc icons/default/formatTextCodeBlock.png Binary file icons/default/formatTextCodeBlock.png has changed
diff -r 852016bbdedb -r c307358a2ecc icons/default/formatTextHeader.png Binary file icons/default/formatTextHeader.png has changed
diff -r 852016bbdedb -r c307358a2ecc icons/default/formatTextHeader1.png Binary file icons/default/formatTextHeader1.png has changed
diff -r 852016bbdedb -r c307358a2ecc icons/default/formatTextHeader2.png Binary file icons/default/formatTextHeader2.png has changed
diff -r 852016bbdedb -r c307358a2ecc icons/default/formatTextHeader3.png Binary file icons/default/formatTextHeader3.png has changed
diff -r 852016bbdedb -r c307358a2ecc icons/default/formatTextHorizontalLine.png Binary file icons/default/formatTextHorizontalLine.png has changed
diff -r 852016bbdedb -r c307358a2ecc icons/default/formatTextHyperlink.png Binary file icons/default/formatTextHyperlink.png has changed
diff -r 852016bbdedb -r c307358a2ecc icons/default/formatTextImage.png Binary file icons/default/formatTextImage.png has changed
diff -r 852016bbdedb -r c307358a2ecc icons/default/formatTextInlineCode.png Binary file icons/default/formatTextInlineCode.png has changed
diff -r 852016bbdedb -r c307358a2ecc icons/default/formatTextItalic.png Binary file icons/default/formatTextItalic.png has changed
diff -r 852016bbdedb -r c307358a2ecc icons/default/formatTextNumberedList.png Binary file icons/default/formatTextNumberedList.png has changed
diff -r 852016bbdedb -r c307358a2ecc icons/default/formatTextQuote.png Binary file icons/default/formatTextQuote.png has changed
diff -r 852016bbdedb -r c307358a2ecc icons/default/formatTextStrikethrough.png Binary file icons/default/formatTextStrikethrough.png has changed
