diff -r 8ee36e8a315f -r 9f89364d9ffd i18n/eric6_en.ts --- a/i18n/eric6_en.ts Sat Jan 28 18:04:14 2017 +0100 +++ b/i18n/eric6_en.ts Sat Jan 28 19:21:31 2017 +0100 @@ -390,7 +390,7 @@ <context> <name>AddBookmarkDialog</name> <message> - <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.ui" line="26"/> + <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="198"/> <source>Add Bookmark</source> <translation type="unfinished"></translation> </message> @@ -1681,7 +1681,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> <source>&Delete</source> <translation type="unfinished"></translation> </message> @@ -2399,12 +2399,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/CallTraceViewer.ui" line="109"/> + <location filename="../Debugger/CallTraceViewer.py" line="54"/> <source>From</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/CallTraceViewer.ui" line="114"/> + <location filename="../Debugger/CallTraceViewer.py" line="54"/> <source>To</source> <translation type="unfinished"></translation> </message> @@ -2512,7 +2512,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="230"/> + <location filename="../Cooperation/ChatWidget.py" line="513"/> <source>Clear</source> <translation type="unfinished"></translation> </message> @@ -2862,7 +2862,7 @@ <context> <name>ClickToFlashWhitelistDialog</name> <message> - <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="14"/> + <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="54"/> <source>ClickToFlash Whitelist</source> <translation type="unfinished"></translation> </message> @@ -4778,7 +4778,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/> <source><no cookie selected></source> <translation type="unfinished"></translation> </message> @@ -7321,7 +7321,7 @@ <context> <name>DownloadManager</name> <message> - <location filename="../WebBrowser/Download/DownloadManager.ui" line="14"/> + <location filename="../WebBrowser/Download/DownloadManager.py" line="363"/> <source>Downloads</source> <translation type="unfinished"></translation> </message> @@ -7767,92 +7767,92 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="257"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="41"/> <source>Abort</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="264"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="42"/> <source>Apply</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="271"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="43"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="278"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="44"/> <source>Close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="285"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="45"/> <source>Discard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="292"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="46"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="299"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="47"/> <source>Ignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="306"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="48"/> <source>No</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="313"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="49"/> <source>No to all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="320"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="50"/> <source>Ok</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="327"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="51"/> <source>Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="334"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="52"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="341"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="53"/> <source>Restore defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="348"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="54"/> <source>Retry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="355"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="55"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="362"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="56"/> <source>Save all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="369"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="57"/> <source>Yes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="376"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="58"/> <source>Yes to all</source> <translation type="unfinished"></translation> </message> @@ -9867,7 +9867,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="146"/> + <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.ui" line="156"/> + <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.ui" line="173"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="301"/> <source>Compile APIs</source> <translation type="unfinished"></translation> </message> @@ -11023,7 +11023,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/> <source>Font</source> <translation type="unfinished"></translation> </message> @@ -11033,7 +11033,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="113"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> <source>Fill to end of line</source> <translation type="unfinished"></translation> </message> @@ -12564,7 +12564,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/> <source>Disabled</source> <translation type="unfinished"></translation> </message> @@ -13283,7 +13283,7 @@ <context> <name>EmailDialog</name> <message> - <location filename="../UI/EmailDialog.ui" line="13"/> + <location filename="../UI/EmailDialog.py" line="346"/> <source>Send bug report</source> <translation type="unfinished"></translation> </message> @@ -14701,12 +14701,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="122"/> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110"/> <source>Host</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="127"/> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="111"/> <source>Permission</source> <translation type="unfinished"></translation> </message> @@ -14721,7 +14721,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="97"/> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="51"/> <source>Geolocation</source> <translation type="unfinished"></translation> </message> @@ -15843,7 +15843,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/> <source><no flash cookie selected></source> <translation type="unfinished"></translation> </message> @@ -15853,7 +15853,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="137"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="122"/> <source>Origin:</source> <translation type="unfinished"></translation> </message> @@ -15888,7 +15888,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="225"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="213"/> <source>Remove Cookie</source> <translation type="unfinished"></translation> </message> @@ -16313,7 +16313,7 @@ <context> <name>GreaseMonkeyAddScriptDialog</name> <message> - <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.ui" line="14"/> + <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py" line="105"/> <source>GreaseMonkey Script Installation</source> <translation type="unfinished"></translation> </message> @@ -21463,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> @@ -21513,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> @@ -21663,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> @@ -21743,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> @@ -21901,7 +21901,7 @@ <context> <name>HgAddSubrepositoryDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="98"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> @@ -23076,7 +23076,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="73"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="246"/> <source>Resolved</source> <translation type="unfinished"></translation> </message> @@ -23086,7 +23086,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="83"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="244"/> <source>Unresolved</source> <translation type="unfinished"></translation> </message> @@ -23663,7 +23663,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="317"/> <source>Revision</source> <translation type="unfinished"></translation> </message> @@ -24035,7 +24035,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="249"/> <source>Edit Plan</source> <translation type="unfinished"></translation> </message> @@ -24176,7 +24176,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> @@ -24216,17 +24216,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> <source>Author</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="103"/> <source>Message</source> <translation type="unfinished"></translation> </message> @@ -24775,111 +24775,6 @@ <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> @@ -24889,12 +24784,6 @@ <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> @@ -25250,87 +25139,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> @@ -25340,42 +25224,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> @@ -25539,1266 +25423,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> @@ -28142,7 +28006,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="313"/> <source>Mercurial Status</source> <translation type="unfinished"></translation> </message> @@ -28283,7 +28147,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="708"/> <source>Commit</source> <translation type="unfinished"></translation> </message> @@ -28403,7 +28267,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="854"/> <source>Differences</source> <translation type="unfinished"></translation> </message> @@ -29668,7 +29532,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/> <source>&Remove</source> <translation type="unfinished"></translation> </message> @@ -35502,109 +35366,94 @@ <translation type="unfinished"></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>Incoming / Outgoing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="242"/> - <source>Select to show the incoming and outgoing log in a log browser dialog</source> + <source>Pull</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="245"/> - <source>Use Log Browser for incoming / outgoing log</source> + <source>Update after pulling</source> + <translation type="unfinished"></translation> + </message> + <message> + <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="337"/> + <source>Edit configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <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="317"/> + <source>Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <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="252"/> + <source>Select to prefer unbundle over pull</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="255"/> - <source>Pull</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="261"/> - <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="264"/> - <source>Update after pulling</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="353"/> - <source>Edit the Mercurial configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="356"/> - <source>Edit configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="330"/> - <source>Cleanup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="336"/> - <source>Pattern:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="343"/> - <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="271"/> - <source>Select to prefer unbundle over pull</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="274"/> <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="259"/> + <source>Prefer Unbundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <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="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="301"/> + <source>Create Backup Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <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="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="278"/> - <source>Prefer Unbundle</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="311"/> - <source>Revert</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="317"/> - <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="320"/> - <source>Create Backup Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="288"/> - <source>Merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="294"/> - <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="297"/> <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="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="282"/> <source>Use internal merge with conflict markers</source> <translation type="unfinished"></translation> </message> @@ -35820,92 +35669,92 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="219"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="40"/> <source>Apply</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="226"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="39"/> <source>Abort</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="233"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="41"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="240"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="45"/> <source>Ignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="247"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="54"/> <source>Save all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="254"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="53"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="261"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="43"/> <source>Discard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="268"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="56"/> <source>Yes to all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="275"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="49"/> <source>Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="282"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="50"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="289"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="48"/> <source>Ok</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="296"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="46"/> <source>No</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="303"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="44"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="310"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="47"/> <source>No to all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="317"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="52"/> <source>Retry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="324"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="51"/> <source>Restore defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="331"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="55"/> <source>Yes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="338"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="42"/> <source>Close</source> <translation type="unfinished"></translation> </message> @@ -37605,7 +37454,7 @@ <context> <name>NoCacheHostsDialog</name> <message> - <location filename="../Helpviewer/Network/NoCacheHostsDialog.ui" line="14"/> + <location filename="../Helpviewer/Network/NoCacheHostsDialog.py" line="52"/> <source>Not Cached Hosts</source> <translation type="unfinished"></translation> </message> @@ -37713,7 +37562,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NotificationsPage.ui" line="146"/> + <location filename="../Preferences/ConfigurationPages/NotificationsPage.py" line="81"/> <source>Visual Selection</source> <translation type="unfinished"></translation> </message> @@ -38383,7 +38232,7 @@ <context> <name>PasswordsDialog</name> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.ui" line="14"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="91"/> <source>Saved Passwords</source> <translation type="unfinished"></translation> </message> @@ -43133,7 +42982,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../DataViews/PyCoverageDialog.ui" line="172"/> + <location filename="../DataViews/PyCoverageDialog.py" line="349"/> <source>Coverage</source> <translation type="unfinished"></translation> </message> @@ -43212,7 +43061,7 @@ </translation> </message> <message> - <location filename="../DataViews/PyCoverageDialog.ui" line="192"/> + <location filename="../DataViews/PyCoverageDialog.py" line="345"/> <source>%v/%m Files</source> <translation type="unfinished"></translation> </message> @@ -43220,7 +43069,7 @@ <context> <name>PyProfileDialog</name> <message> - <location filename="../DataViews/PyProfileDialog.ui" line="20"/> + <location filename="../DataViews/PyProfileDialog.py" line="233"/> <source>Profile Results</source> <translation type="unfinished"></translation> </message> @@ -44133,521 +43982,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> @@ -47812,7 +47641,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="89"/> + <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="150"/> <source>Remove Filters</source> <translation type="unfinished"></translation> </message> @@ -47822,7 +47651,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="99"/> + <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="178"/> <source>Remove Attributes</source> <translation type="unfinished"></translation> </message> @@ -49298,7 +49127,7 @@ <context> <name>SendRefererWhitelistDialog</name> <message> - <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.ui" line="14"/> + <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.py" line="52"/> <source>Send Referer Whitelist</source> <translation type="unfinished"></translation> </message> @@ -50498,7 +50327,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Snapshot/SnapWidget.ui" line="20"/> + <location filename="../Snapshot/SnapWidget.py" line="531"/> <source>eric6 Snapshot</source> <translation type="unfinished"></translation> </message> @@ -52047,7 +51876,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> @@ -52137,137 +51966,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> @@ -52283,28 +52102,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> @@ -52484,37 +52303,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> @@ -53068,7 +52887,7 @@ <context> <name>SvnDiffDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/> <source>Subversion Diff</source> <translation type="unfinished"></translation> </message> @@ -53370,17 +53189,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="661"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="117"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="658"/> <source>Author</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="165"/> <source>Message</source> <translation type="unfinished"></translation> </message> @@ -53633,63 +53452,6 @@ <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="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> - <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"/> <source>Select to show differences side-by-side</source> <translation type="unfinished"></translation> @@ -53842,7 +53604,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/> <source>&URL:</source> <translation type="unfinished"></translation> </message> @@ -53934,7 +53696,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/> <source>&URL:</source> <translation type="unfinished"></translation> </message> @@ -53978,177 +53740,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> @@ -54217,506 +53974,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> @@ -55140,7 +54877,7 @@ <context> <name>SvnStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="394"/> <source>Subversion Status</source> <translation type="unfinished"></translation> </message> @@ -55416,7 +55153,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="80"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="711"/> <source>Commit</source> <translation type="unfinished"></translation> </message> @@ -60597,7 +60334,7 @@ <context> <name>UnittestDialog</name> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="14"/> + <location filename="../PyUnit/UnittestDialog.py" line="403"/> <source>Unittest</source> <translation type="unfinished"></translation> </message> @@ -64062,7 +63799,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> @@ -64077,7 +63814,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> @@ -64157,17 +63894,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> @@ -71388,46 +71125,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> @@ -71435,12 +71172,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> @@ -71451,13 +71188,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> @@ -72002,17 +71739,17 @@ <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>