--- a/i18n/eric5_en.ts Mon Sep 05 19:30:37 2011 +0200 +++ b/i18n/eric5_en.ts Mon Sep 05 20:01:12 2011 +0200 @@ -5429,67 +5429,67 @@ <context> <name>DiffDialog</name> <message> - <location filename="UI/DiffDialog.ui" line="13"/> + <location filename="UI/DiffDialog.ui" line="14"/> <source>File Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="21"/> + <location filename="UI/DiffDialog.ui" line="22"/> <source>File &1:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="31"/> + <location filename="UI/DiffDialog.ui" line="32"/> <source>Enter the name of the first file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="69"/> + <location filename="UI/DiffDialog.ui" line="70"/> <source>Press to select the file via a file selection dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="72"/> - <source>...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="UI/DiffDialog.ui" line="52"/> + <location filename="UI/DiffDialog.ui" line="73"/> + <source>...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="UI/DiffDialog.ui" line="53"/> <source>File &2:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="62"/> + <location filename="UI/DiffDialog.ui" line="63"/> <source>Enter the name of the second file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="87"/> + <location filename="UI/DiffDialog.ui" line="88"/> <source>Select to generate a unified diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="90"/> + <location filename="UI/DiffDialog.ui" line="91"/> <source>&Unified Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="93"/> + <location filename="UI/DiffDialog.ui" line="94"/> <source>Alt+U</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="103"/> + <location filename="UI/DiffDialog.ui" line="104"/> <source>Select to generate a context diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="106"/> + <location filename="UI/DiffDialog.ui" line="107"/> <source>Co&ntext Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="109"/> + <location filename="UI/DiffDialog.ui" line="110"/> <source>Alt+N</source> <translation type="unfinished"></translation> </message> @@ -15361,7 +15361,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -15371,47 +15371,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2283"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2290"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2328"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2335"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -15421,17 +15421,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2486"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2373"/> <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="2479"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2486"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -16258,39 +16258,39 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="49"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="46"/> <source>Shows the name of the source</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="52"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="49"/> <source><b>Source name</b> <p>This field shows the name of the source.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="60"/> + <source>Enter the target name</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> - <source>Enter the target name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="66"/> <source><b>Target name</b> <p>Enter the new name in this field.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="74"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="71"/> <source>Target:</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="80"/> + <source>Select to force the operation</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="83"/> - <source>Select to force the operation</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="86"/> <source>Enforce operation</source> <translation type="unfinished"></translation> </message> @@ -16386,52 +16386,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="35"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="32"/> <source><b>Mercurial Diff</b><p>This shows the output of the hg diff command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="63"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="60"/> <source>Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="85"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="82"/> <source>Input</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="104"/> + <source>Press to send the input to the hg process</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="107"/> - <source>Press to send the input to the hg process</source> + <source>&Send</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="110"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="113"/> <source>Alt+S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="120"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="117"/> <source>Enter data to be sent to the hg process</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="124"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="127"/> - <source>Select to switch the input field to password mode</source> + <source>&Password Mode</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="130"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="133"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> @@ -18381,7 +18381,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> @@ -18521,7 +18521,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -19636,7 +19636,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="188"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="195"/> <source>Mercurial Status</source> <translation type="unfinished"></translation> </message> @@ -19717,102 +19717,102 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="70"/> <source>Add to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="70"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="74"/> <source>Remove from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="72"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="76"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="77"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="81"/> <source>Adjust column sizes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> - <source>added</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> - <source>modified</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> + <source>added</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="107"/> + <source>modified</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="108"/> <source>removed</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> + <source>not tracked</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="110"/> + <source>missing</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> - <source>not tracked</source> + <source>normal</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> - <source>missing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> - <source>normal</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> <source>ignored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="245"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="245"/> <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/HgStatusDialog.py" line="540"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="547"/> <source>Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="567"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="586"/> <source>Add</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="567"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="586"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="588"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="607"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> <source>Revert</source> <translation type="unfinished"></translation> </message> @@ -19887,30 +19887,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="68"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="72"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="74"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="78"/> <source>Restore missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="452"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="459"/> <source>all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="540"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="547"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="65"/> + <source>Select all for commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="67"/> + <source>Deselect all from commit</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgStatusMonitorThread</name> @@ -35392,70 +35402,70 @@ <context> <name>SvnCopyDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="13"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="14"/> <source>Subversion Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="27"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="28"/> <source>Press to open a selection dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.ui" line="30"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.ui" line="31"/> <source><b>Target directory</b> <p>Select the target name for the operation via a selection dialog.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="34"/> - <source>...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="41"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="35"/> + <source>...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="42"/> <source>Source:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="51"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="49"/> <source>Shows the name of the source</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="54"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="52"/> <source><b>Source name</b> <p>This field shows the name of the source.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="65"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="63"/> <source>Enter the target name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="68"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="66"/> <source><b>Target name</b> <p>Enter the new name in this field.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="76"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="74"/> <source>Target:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="85"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="83"/> <source>Select to force the operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="88"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="86"/> <source>Enforce operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="30"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="31"/> <source><b>Target name</b> <p>Select the target name for the operation via a selection dialog.</p></source> <translation type="unfinished"></translation> @@ -35592,57 +35602,57 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui" line="25"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui" line="26"/> <source>Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui" line="34"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui" line="32"/> <source><b>Subversion Diff</b><p>This shows the output of the svn diff command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui" line="62"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui" line="60"/> <source>Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="84"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="82"/> <source>Input</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="106"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="104"/> <source>Press to send the input to the subversion process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="109"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="107"/> <source>&Send</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="112"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="110"/> <source>Alt+S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="119"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="117"/> <source>Enter data to be sent to the subversion process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="126"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="124"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="129"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="127"/> <source>&Password Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="132"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="130"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> @@ -37644,7 +37654,7 @@ <context> <name>SvnStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="279"/> <source>Subversion Status</source> <translation type="unfinished"></translation> </message> @@ -37775,202 +37785,202 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="83"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="87"/> <source>Add to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="87"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="91"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="97"/> <source>Add to Changelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="767"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="786"/> <source>Remove from Changelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="702"/> <source>Lock</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="699"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="718"/> <source>Unlock</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="104"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="108"/> <source>Break lock</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="107"/> - <source>Steal lock</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="111"/> + <source>Steal lock</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="115"/> <source>Adjust column sizes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="151"/> <source>added</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="148"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="152"/> <source>deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="164"/> <source>modified</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="158"/> + <source>unversioned</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="155"/> + <source>locked</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="156"/> + <source>other lock</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="157"/> + <source>stolen lock</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="158"/> + <source>broken lock</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="154"/> + <source>not locked</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="163"/> + <source>normal</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> - <source>unversioned</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="151"/> - <source>locked</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="152"/> - <source>other lock</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="153"/> - <source>stolen lock</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="154"/> - <source>broken lock</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="150"/> - <source>not locked</source> + <source>replaced</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="165"/> + <source>conflict</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="156"/> + <source>external</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="157"/> + <source>ignored</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="159"/> - <source>normal</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="150"/> - <source>replaced</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="161"/> - <source>conflict</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="152"/> - <source>external</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="153"/> - <source>ignored</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="155"/> <source>missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="156"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="160"/> <source>type error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="157"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="161"/> <source>no</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="158"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="162"/> <source>yes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="375"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="375"/> <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/vcsPySvn/SvnStatusDialog.py" line="578"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="585"/> <source>Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> - <source>There are no uncommitted changes available/selected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="605"/> - <source>Add</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="605"/> - <source>There are no unversioned entries available/selected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="647"/> - <source>Revert</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <source>There are no uncommitted changes available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/> + <source>Add</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/> + <source>There are no unversioned entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> + <source>Revert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="702"/> <source>There are no unlocked files available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="752"/> <source>There are no locked files available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="716"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="735"/> <source>Break Lock</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="752"/> <source>Steal Lock</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="749"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="768"/> <source>There are no files available/selected not belonging to a changelist.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="767"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="786"/> <source>There are no files available/selected belonging to a changelist.</source> <translation type="unfinished"></translation> </message> @@ -38035,35 +38045,45 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="85"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="89"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="89"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="93"/> <source>Restore missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="497"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="504"/> <source>all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="578"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="585"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="647"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="82"/> + <source>Select all for commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="84"/> + <source>Deselect all from commit</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnStatusMonitorThread</name>