Mon, 05 Sep 2011 20:01:12 +0200
Added context menu actions to select/deselect all commitable items of the various VCS status dialogs.
diff -r 74fc87c7b7a8 -r d051b9d1426d Documentation/Help/source.qch Binary file Documentation/Help/source.qch has changed
diff -r 74fc87c7b7a8 -r d051b9d1426d Documentation/Help/source.qhp --- a/Documentation/Help/source.qhp Mon Sep 05 19:30:37 2011 +0200 +++ b/Documentation/Help/source.qhp Mon Sep 05 20:01:12 2011 +0200 @@ -8501,6 +8501,9 @@ <keyword name="HgStatusDialog (Constructor)" id="HgStatusDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__init__" /> <keyword name="HgStatusDialog.__add" id="HgStatusDialog.__add" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__add" /> <keyword name="HgStatusDialog.__commit" id="HgStatusDialog.__commit" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__commit" /> + <keyword name="HgStatusDialog.__commitDeselectAll" id="HgStatusDialog.__commitDeselectAll" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__commitDeselectAll" /> + <keyword name="HgStatusDialog.__commitSelect" id="HgStatusDialog.__commitSelect" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__commitSelect" /> + <keyword name="HgStatusDialog.__commitSelectAll" id="HgStatusDialog.__commitSelectAll" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__commitSelectAll" /> <keyword name="HgStatusDialog.__committed" id="HgStatusDialog.__committed" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__committed" /> <keyword name="HgStatusDialog.__diff" id="HgStatusDialog.__diff" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__diff" /> <keyword name="HgStatusDialog.__finish" id="HgStatusDialog.__finish" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__finish" /> @@ -9039,6 +9042,9 @@ <keyword name="SvnStatusDialog.__addToChangelist" id="SvnStatusDialog.__addToChangelist" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__addToChangelist" /> <keyword name="SvnStatusDialog.__breakLock" id="SvnStatusDialog.__breakLock" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__breakLock" /> <keyword name="SvnStatusDialog.__commit" id="SvnStatusDialog.__commit" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__commit" /> + <keyword name="SvnStatusDialog.__commitDeselectAll" id="SvnStatusDialog.__commitDeselectAll" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__commitDeselectAll" /> + <keyword name="SvnStatusDialog.__commitSelect" id="SvnStatusDialog.__commitSelect" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__commitSelect" /> + <keyword name="SvnStatusDialog.__commitSelectAll" id="SvnStatusDialog.__commitSelectAll" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__commitSelectAll" /> <keyword name="SvnStatusDialog.__committed" id="SvnStatusDialog.__committed" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__committed" /> <keyword name="SvnStatusDialog.__diff" id="SvnStatusDialog.__diff" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__diff" /> <keyword name="SvnStatusDialog.__finish" id="SvnStatusDialog.__finish" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html#SvnStatusDialog.__finish" /> @@ -9416,6 +9422,9 @@ <keyword name="SvnStatusDialog.__addToChangelist" id="SvnStatusDialog.__addToChangelist" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__addToChangelist" /> <keyword name="SvnStatusDialog.__breakLock" id="SvnStatusDialog.__breakLock" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__breakLock" /> <keyword name="SvnStatusDialog.__commit" id="SvnStatusDialog.__commit" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__commit" /> + <keyword name="SvnStatusDialog.__commitDeselectAll" id="SvnStatusDialog.__commitDeselectAll" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__commitDeselectAll" /> + <keyword name="SvnStatusDialog.__commitSelect" id="SvnStatusDialog.__commitSelect" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__commitSelect" /> + <keyword name="SvnStatusDialog.__commitSelectAll" id="SvnStatusDialog.__commitSelectAll" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__commitSelectAll" /> <keyword name="SvnStatusDialog.__committed" id="SvnStatusDialog.__committed" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__committed" /> <keyword name="SvnStatusDialog.__diff" id="SvnStatusDialog.__diff" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__diff" /> <keyword name="SvnStatusDialog.__finish" id="SvnStatusDialog.__finish" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html#SvnStatusDialog.__finish" />
diff -r 74fc87c7b7a8 -r d051b9d1426d Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html --- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html Mon Sep 05 19:30:37 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html Mon Sep 05 20:01:12 2011 +0200 @@ -67,6 +67,15 @@ <td><a href="#HgStatusDialog.__commit">__commit</a></td> <td>Private slot to handle the Commit context menu entry.</td> </tr><tr> +<td><a href="#HgStatusDialog.__commitDeselectAll">__commitDeselectAll</a></td> +<td>Private slot to deselect all entries from commit.</td> +</tr><tr> +<td><a href="#HgStatusDialog.__commitSelect">__commitSelect</a></td> +<td>Private slot to select or deselect all entries.</td> +</tr><tr> +<td><a href="#HgStatusDialog.__commitSelectAll">__commitSelectAll</a></td> +<td>Private slot to select all entries for commit.</td> +</tr><tr> <td><a href="#HgStatusDialog.__committed">__committed</a></td> <td>Private slot called after the commit has finished.</td> </tr><tr> @@ -209,6 +218,26 @@ <b>__commit</b>(<i></i>) <p> Private slot to handle the Commit context menu entry. +</p><a NAME="HgStatusDialog.__commitDeselectAll" ID="HgStatusDialog.__commitDeselectAll"></a> +<h4>HgStatusDialog.__commitDeselectAll</h4> +<b>__commitDeselectAll</b>(<i></i>) +<p> + Private slot to deselect all entries from commit. +</p><a NAME="HgStatusDialog.__commitSelect" ID="HgStatusDialog.__commitSelect"></a> +<h4>HgStatusDialog.__commitSelect</h4> +<b>__commitSelect</b>(<i>selected</i>) +<p> + Private slot to select or deselect all entries. +</p><dl> +<dt><i>selected</i></dt> +<dd> +commit selection state to be set (boolean) +</dd> +</dl><a NAME="HgStatusDialog.__commitSelectAll" ID="HgStatusDialog.__commitSelectAll"></a> +<h4>HgStatusDialog.__commitSelectAll</h4> +<b>__commitSelectAll</b>(<i></i>) +<p> + Private slot to select all entries for commit. </p><a NAME="HgStatusDialog.__committed" ID="HgStatusDialog.__committed"></a> <h4>HgStatusDialog.__committed</h4> <b>__committed</b>(<i></i>)
diff -r 74fc87c7b7a8 -r d051b9d1426d Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html --- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html Mon Sep 05 19:30:37 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html Mon Sep 05 20:01:12 2011 +0200 @@ -75,6 +75,15 @@ <td><a href="#SvnStatusDialog.__commit">__commit</a></td> <td>Private slot to handle the Commit context menu entry.</td> </tr><tr> +<td><a href="#SvnStatusDialog.__commitDeselectAll">__commitDeselectAll</a></td> +<td>Private slot to deselect all entries from commit.</td> +</tr><tr> +<td><a href="#SvnStatusDialog.__commitSelect">__commitSelect</a></td> +<td>Private slot to select or deselect all entries.</td> +</tr><tr> +<td><a href="#SvnStatusDialog.__commitSelectAll">__commitSelectAll</a></td> +<td>Private slot to select all entries for commit.</td> +</tr><tr> <td><a href="#SvnStatusDialog.__committed">__committed</a></td> <td>Private slot called after the commit has finished.</td> </tr><tr> @@ -215,6 +224,26 @@ <b>__commit</b>(<i></i>) <p> Private slot to handle the Commit context menu entry. +</p><a NAME="SvnStatusDialog.__commitDeselectAll" ID="SvnStatusDialog.__commitDeselectAll"></a> +<h4>SvnStatusDialog.__commitDeselectAll</h4> +<b>__commitDeselectAll</b>(<i></i>) +<p> + Private slot to deselect all entries from commit. +</p><a NAME="SvnStatusDialog.__commitSelect" ID="SvnStatusDialog.__commitSelect"></a> +<h4>SvnStatusDialog.__commitSelect</h4> +<b>__commitSelect</b>(<i>selected</i>) +<p> + Private slot to select or deselect all entries. +</p><dl> +<dt><i>selected</i></dt> +<dd> +commit selection state to be set (boolean) +</dd> +</dl><a NAME="SvnStatusDialog.__commitSelectAll" ID="SvnStatusDialog.__commitSelectAll"></a> +<h4>SvnStatusDialog.__commitSelectAll</h4> +<b>__commitSelectAll</b>(<i></i>) +<p> + Private slot to select all entries for commit. </p><a NAME="SvnStatusDialog.__committed" ID="SvnStatusDialog.__committed"></a> <h4>SvnStatusDialog.__committed</h4> <b>__committed</b>(<i></i>)
diff -r 74fc87c7b7a8 -r d051b9d1426d Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html --- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html Mon Sep 05 19:30:37 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html Mon Sep 05 20:01:12 2011 +0200 @@ -75,6 +75,15 @@ <td><a href="#SvnStatusDialog.__commit">__commit</a></td> <td>Private slot to handle the Commit context menu entry.</td> </tr><tr> +<td><a href="#SvnStatusDialog.__commitDeselectAll">__commitDeselectAll</a></td> +<td>Private slot to deselect all entries from commit.</td> +</tr><tr> +<td><a href="#SvnStatusDialog.__commitSelect">__commitSelect</a></td> +<td>Private slot to select or deselect all entries.</td> +</tr><tr> +<td><a href="#SvnStatusDialog.__commitSelectAll">__commitSelectAll</a></td> +<td>Private slot to select all entries for commit.</td> +</tr><tr> <td><a href="#SvnStatusDialog.__committed">__committed</a></td> <td>Private slot called after the commit has finished.</td> </tr><tr> @@ -236,6 +245,26 @@ <b>__commit</b>(<i></i>) <p> Private slot to handle the Commit context menu entry. +</p><a NAME="SvnStatusDialog.__commitDeselectAll" ID="SvnStatusDialog.__commitDeselectAll"></a> +<h4>SvnStatusDialog.__commitDeselectAll</h4> +<b>__commitDeselectAll</b>(<i></i>) +<p> + Private slot to deselect all entries from commit. +</p><a NAME="SvnStatusDialog.__commitSelect" ID="SvnStatusDialog.__commitSelect"></a> +<h4>SvnStatusDialog.__commitSelect</h4> +<b>__commitSelect</b>(<i>selected</i>) +<p> + Private slot to select or deselect all entries. +</p><dl> +<dt><i>selected</i></dt> +<dd> +commit selection state to be set (boolean) +</dd> +</dl><a NAME="SvnStatusDialog.__commitSelectAll" ID="SvnStatusDialog.__commitSelectAll"></a> +<h4>SvnStatusDialog.__commitSelectAll</h4> +<b>__commitSelectAll</b>(<i></i>) +<p> + Private slot to select all entries for commit. </p><a NAME="SvnStatusDialog.__committed" ID="SvnStatusDialog.__committed"></a> <h4>SvnStatusDialog.__committed</h4> <b>__committed</b>(<i></i>)
diff -r 74fc87c7b7a8 -r d051b9d1426d Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py --- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Mon Sep 05 19:30:37 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Mon Sep 05 20:01:12 2011 +0200 @@ -62,6 +62,10 @@ self.menu = QMenu() self.menuactions.append(self.menu.addAction( self.trUtf8("Commit changes to repository..."), self.__commit)) + self.menuactions.append(self.menu.addAction( + self.trUtf8("Select all for commit"), self.__commitSelectAll)) + self.menuactions.append(self.menu.addAction( + self.trUtf8("Deselect all from commit"), self.__commitDeselectAll)) self.menu.addSeparator() self.menuactions.append(self.menu.addAction( self.trUtf8("Add to repository"), self.__add)) @@ -138,7 +142,10 @@ itm.setTextAlignment(2, Qt.AlignLeft) if status in "AMR": + itm.setFlags(itm.flags() | Qt.ItemIsUserCheckable) itm.setCheckState(self.__toBeCommittedColumn, Qt.Checked) + else: + itm.setFlags(itm.flags() & ~Qt.ItemIsUserCheckable) if statusText not in self.__statusFilters: self.__statusFilters.append(statusText) @@ -557,6 +564,18 @@ self.on_refreshButton_clicked() self.vcs.checkVCSStatus() + def __commitSelectAll(self): + """ + Private slot to select all entries for commit. + """ + self.__commitSelect(True) + + def __commitDeselectAll(self): + """ + Private slot to deselect all entries from commit. + """ + self.__commitSelect(False) + def __add(self): """ Private slot to handle the Add context menu entry. @@ -698,3 +717,17 @@ if itm.text(self.__statusColumn) in self.missingIndicators: missingItems.append(itm) return missingItems + + def __commitSelect(self, selected): + """ + Private slot to select or deselect all entries. + + @param selected commit selection state to be set (boolean) + """ + for index in range(self.statusList.topLevelItemCount()): + itm = self.statusList.topLevelItem(index) + if itm.flags() & Qt.ItemIsUserCheckable: + if selected: + itm.setCheckState(self.__toBeCommittedColumn, Qt.Checked) + else: + itm.setCheckState(self.__toBeCommittedColumn, Qt.Unchecked)
diff -r 74fc87c7b7a8 -r d051b9d1426d Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py --- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Mon Sep 05 19:30:37 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Mon Sep 05 20:01:12 2011 +0200 @@ -79,6 +79,10 @@ self.menu = QMenu() self.menuactions.append(self.menu.addAction( self.trUtf8("Commit changes to repository..."), self.__commit)) + self.menuactions.append(self.menu.addAction( + self.trUtf8("Select all for commit"), self.__commitSelectAll)) + self.menuactions.append(self.menu.addAction( + self.trUtf8("Deselect all from commit"), self.__commitDeselectAll)) self.menu.addSeparator() self.menuactions.append(self.menu.addAction( self.trUtf8("Add to repository"), self.__add)) @@ -238,7 +242,10 @@ propStatus in [pysvn.wc_status_kind.added, pysvn.wc_status_kind.deleted, pysvn.wc_status_kind.modified]: + itm.setFlags(itm.flags() | Qt.ItemIsUserCheckable) itm.setCheckState(self.__toBeCommittedColumn, Qt.Checked) + else: + itm.setFlags(itm.flags() & ~Qt.ItemIsUserCheckable) if statusText not in self.__statusFilters: self.__statusFilters.append(statusText) @@ -595,6 +602,18 @@ self.on_refreshButton_clicked() self.vcs.checkVCSStatus() + def __commitSelectAll(self): + """ + Private slot to select all entries for commit. + """ + self.__commitSelect(True) + + def __commitDeselectAll(self): + """ + Private slot to deselect all entries from commit. + """ + self.__commitSelect(False) + def __add(self): """ Private slot to handle the Add context menu entry. @@ -863,3 +882,17 @@ if not itm.text(self.__changelistColumn): clitems.append(itm) return clitems + + def __commitSelect(self, selected): + """ + Private slot to select or deselect all entries. + + @param selected commit selection state to be set (boolean) + """ + for index in range(self.statusList.topLevelItemCount()): + itm = self.statusList.topLevelItem(index) + if itm.flags() & Qt.ItemIsUserCheckable: + if selected: + itm.setCheckState(self.__toBeCommittedColumn, Qt.Checked) + else: + itm.setCheckState(self.__toBeCommittedColumn, Qt.Unchecked)
diff -r 74fc87c7b7a8 -r d051b9d1426d Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py --- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Mon Sep 05 19:30:37 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Mon Sep 05 20:01:12 2011 +0200 @@ -75,6 +75,10 @@ self.menu = QMenu() self.menuactions.append(self.menu.addAction( self.trUtf8("Commit changes to repository..."), self.__commit)) + self.menuactions.append(self.menu.addAction( + self.trUtf8("Select all for commit"), self.__commitSelectAll)) + self.menuactions.append(self.menu.addAction( + self.trUtf8("Deselect all from commit"), self.__commitDeselectAll)) self.menu.addSeparator() self.menuactions.append(self.menu.addAction( self.trUtf8("Add to repository"), self.__add)) @@ -269,7 +273,10 @@ itm.setTextAlignment(12, Qt.AlignLeft) if status in "ADM" or propStatus in "M": + itm.setFlags(itm.flags() | Qt.ItemIsUserCheckable) itm.setCheckState(self.__toBeCommittedColumn, Qt.Checked) + else: + itm.setFlags(itm.flags() & ~Qt.ItemIsUserCheckable) self.hidePropertyStatusColumn = self.hidePropertyStatusColumn and \ propStatus == " " @@ -689,6 +696,18 @@ self.on_refreshButton_clicked() self.vcs.checkVCSStatus() + def __commitSelectAll(self): + """ + Private slot to select all entries for commit. + """ + self.__commitSelect(True) + + def __commitDeselectAll(self): + """ + Private slot to deselect all entries from commit. + """ + self.__commitSelect(False) + def __add(self): """ Private slot to handle the Add context menu entry. @@ -957,3 +976,17 @@ if itm.text(self.__changelistColumn) == "": clitems.append(itm) return clitems + + def __commitSelect(self, selected): + """ + Private slot to select or deselect all entries. + + @param selected commit selection state to be set (boolean) + """ + for index in range(self.statusList.topLevelItemCount()): + itm = self.statusList.topLevelItem(index) + if itm.flags() & Qt.ItemIsUserCheckable: + if selected: + itm.setCheckState(self.__toBeCommittedColumn, Qt.Checked) + else: + itm.setCheckState(self.__toBeCommittedColumn, Qt.Unchecked)
diff -r 74fc87c7b7a8 -r d051b9d1426d changelog --- a/changelog Mon Sep 05 19:30:37 2011 +0200 +++ b/changelog Mon Sep 05 20:01:12 2011 +0200 @@ -15,6 +15,8 @@ - enhancements to the version control system interfaces -- all --- made "Show Log" behave like "Show Limited Log" and removed the later + --- added context menu actions to select/deselect all commitable items + of the status dialogs -- Mercurial --- added interface for the Mercurial command server (as of Mercurial 1.9) --- added code to support multiple revisions where appropriate
diff -r 74fc87c7b7a8 -r d051b9d1426d i18n/eric5_cs.ts --- a/i18n/eric5_cs.ts Mon Sep 05 19:30:37 2011 +0200 +++ b/i18n/eric5_cs.ts Mon Sep 05 20:01:12 2011 +0200 @@ -5510,67 +5510,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>Odlišnosti v souboru</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="21"/> + <location filename="UI/DiffDialog.ui" line="22"/> <source>File &1:</source> <translation>Soubor &1:</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>Zadání jména prvního souboru</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>Stisknout pro výběr souboru přes dialog výběru souborů</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="72"/> + <location filename="UI/DiffDialog.ui" line="73"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="52"/> + <location filename="UI/DiffDialog.ui" line="53"/> <source>File &2:</source> <translation>Soubor &2:</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>Zadejte jméno druhého souboru</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>Zapnout generování sjednoceného diffu</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="90"/> + <location filename="UI/DiffDialog.ui" line="91"/> <source>&Unified Diff</source> <translation>&Sjednocený Diff</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="93"/> + <location filename="UI/DiffDialog.ui" line="94"/> <source>Alt+U</source> <translation></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>Zapnout generování diffu kontextu</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="106"/> + <location filename="UI/DiffDialog.ui" line="107"/> <source>Co&ntext Diff</source> <translation>Ko&ntext Diff</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="109"/> + <location filename="UI/DiffDialog.ui" line="110"/> <source>Alt+N</source> <translation></translation> </message> @@ -15769,7 +15769,7 @@ <translation>Obnovení z přerušené transakce</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>Má být pracovní adresář aktualizován?</translation> </message> @@ -15784,17 +15784,17 @@ <translation>Vytvořit skupinu změn</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>Použít skupinu změn</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>Neplatný bisect podpříkaz ({0}).</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>Mercurial Bisect ({0})</translation> </message> @@ -15819,7 +15819,7 @@ <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> <source>Removing files from the Mercurial repository only</source> <translation>Odebrat soubory jen z Mercurial úložiště</translation> </message> @@ -15834,7 +15834,7 @@ <translation type="obsolete"><p>Soubor Mercurial skupiny změn<b>{0}</b> již existuje.</p><p>Má se přepsat?</p></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>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> </message> @@ -15844,12 +15844,12 @@ <translation>Rozpoznat soubor skupiny změn</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>Zálohovat skupinu změn</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>Nebyla dána žádná revize. Ruším...</translation> </message> @@ -15859,12 +15859,12 @@ <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> @@ -15874,17 +15874,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> @@ -16741,41 +16741,41 @@ <translation>Zdroj:</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>Zobrazuje jméno zdroje</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><b>Jméno zdroje</b> <p>Toto pole zobrazuje jméno zdroje.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="60"/> <source>Enter the target name</source> <translation>Zadejte jméno cíle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="66"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> <source><b>Target name</b> <p>Enter the new name in this field.</p></source> <translation><b>Jméno cíle</b> <p>Zadání jména cíle do tohoto pole.</p></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>Cíl:</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="80"/> + <source>Select to force the operation</source> + <translation>Vybrat pro vynucení operace</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="83"/> - <source>Select to force the operation</source> - <translation>Vybrat pro vynucení operace</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="86"/> <source>Enforce operation</source> <translation>Vynutit operaci</translation> </message> @@ -16871,52 +16871,52 @@ <translation>Odlišnosti</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><b>Mercurial Diff</b><p>Zobrazuje se výstup z hg příkazu diff.</p></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>Chyby</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>Vstup</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="104"/> + <source>Press to send the input to the hg process</source> + <translation>Stisknutím odeslat vstup do hg procesu</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="107"/> - <source>Press to send the input to the hg process</source> - <translation>Stisknutím odeslat vstup do hg procesu</translation> + <source>&Send</source> + <translation>Ode&slat</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="110"/> - <source>&Send</source> - <translation>Ode&slat</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="113"/> <source>Alt+S</source> <translation></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>Zadejte data, která se odešlou do hg procesu</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="124"/> + <source>Select to switch the input field to password mode</source> + <translation>Vybrat pro přepnutí vstupního pole do režimu hesla</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="127"/> - <source>Select to switch the input field to password mode</source> - <translation>Vybrat pro přepnutí vstupního pole do režimu hesla</translation> + <source>&Password Mode</source> + <translation>Ty&p heslo</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="130"/> - <source>&Password Mode</source> - <translation>Ty&p heslo</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="133"/> <source>Alt+P</source> <translation></translation> </message> @@ -18848,7 +18848,7 @@ <translation>Vytvořit soubor s skupinou změn obsahující množinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> @@ -19088,7 +19088,7 @@ <translation type="unfinished">Stáhnout</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">Projekt bude znovu načten. Má se provést?</translation> </message> @@ -20208,7 +20208,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>Mercurial status</translation> </message> @@ -20289,102 +20289,102 @@ <translation>Zapsat změny do repozitáře...</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>Přidat do repozitáře</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>Vrátit změny</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>Přizpůsobit šířky sloupců</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> - <source>added</source> - <translation>přidáno</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> - <source>modified</source> - <translation>změněno</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> + <source>added</source> + <translation>přidáno</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="107"/> + <source>modified</source> + <translation>změněno</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="108"/> <source>removed</source> <translation>odebráno</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> + <source>not tracked</source> + <translation>nesledováno</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> - <source>not tracked</source> - <translation>nesledováno</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> <source>normal</source> <translation>normální</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> - <source>ignored</source> - <translation>ignorováno</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <source>ignored</source> + <translation>ignorováno</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="110"/> <source>missing</source> <translation>chybějící</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>Chyba v procesu generování</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>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</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>Zapsat měny</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>Nezapsné změny nejsou dostupné/vybrané.</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>Přidat</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>Položky mimo verzi nejsou dostupné/vybrány.</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>Vrátit</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>Odebrat z repozitáře</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>Odebrat</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>Chybějící záznamy nejsou dostupné/vybrány.</translation> </message> @@ -20459,17 +20459,17 @@ <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> @@ -20479,15 +20479,25 @@ <translation type="obsolete">Odlišnosti</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> @@ -36400,57 +36410,57 @@ <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>Subversion kopírování</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>Stisknout pro otevření dialogu výběru</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><b>Cílový adresář</b><p>Výběr cílového adresáře přes dialogové okno výběru adresáře.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="34"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="35"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="41"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="42"/> <source>Source:</source> <translation>Zdroj:</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>Zobrazuje jméno zdroje</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><b>Jméno zdroje</b> <p>Toto pole zobrazuje jméno zdroje.</p></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>Zadejte jméno cíle</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><b>Jméno cíle</b> <p>Zadání jména cíle do tohoto pole.</p></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>Cíl:</translation> </message> @@ -36465,17 +36475,17 @@ <translation>Vybrat cíl</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>Vybrat pro vynucení operace</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>Vynutit operaci</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><b>Jméno cíle</b> @@ -36605,57 +36615,57 @@ <translation></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>Odlišnosti</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><b>Subversion Diff</b><p>Zobrazuje se výstup ze svn příkazu diff.</p></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>Chyby</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>Vstup</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>Stisknout pro odeslání vstupu do procesu subversion</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>Ode&slat</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></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>Zadejte data, která mají být do procesu subversion odeslána</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>Výběr přepnutí vstupního pole na mód zadání hesla</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>Mód ve&psání hesla</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></translation> </message> @@ -38690,7 +38700,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></translation> </message> @@ -38817,177 +38827,177 @@ <translation>Komitnout změny do repozitáře...</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>Zamknout</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>Odemknout</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>Prolomit zámek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="107"/> - <source>Steal lock</source> - <translation>Zcizit zámek</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="111"/> + <source>Steal lock</source> + <translation>Zcizit zámek</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="115"/> <source>Adjust column sizes</source> <translation>Přizpůsobit šířky sloupců</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>přidáno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="148"/> - <source>deleted</source> - <translation>smazáno</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="160"/> - <source>modified</source> - <translation>změněno</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="151"/> - <source>locked</source> - <translation>zamčeno</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="152"/> - <source>other lock</source> - <translation>jiný zámek</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="153"/> - <source>stolen lock</source> - <translation>scizený zámek</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="154"/> - <source>broken lock</source> - <translation>prolomený zámek</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="150"/> - <source>not locked</source> - <translation>nezamčeno</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="159"/> - <source>normal</source> - <translation>normální</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="150"/> - <source>replaced</source> - <translation>nahrazeno</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="161"/> - <source>conflict</source> - <translation>konflikt</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="152"/> - <source>external</source> - <translation>externí</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="153"/> - <source>ignored</source> - <translation>ignorováno</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> - <source>unversioned</source> - <translation>mimo verzi</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="155"/> - <source>missing</source> - <translation>chybějící</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="156"/> - <source>type error</source> - <translation>chyba typu</translation> + <source>deleted</source> + <translation>smazáno</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="164"/> + <source>modified</source> + <translation>změněno</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="155"/> + <source>locked</source> + <translation>zamčeno</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="156"/> + <source>other lock</source> + <translation>jiný zámek</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="157"/> - <source>no</source> - <translation>ne</translation> + <source>stolen lock</source> + <translation>scizený zámek</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="158"/> + <source>broken lock</source> + <translation>prolomený zámek</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="154"/> + <source>not locked</source> + <translation>nezamčeno</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="163"/> + <source>normal</source> + <translation>normální</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> + <source>replaced</source> + <translation>nahrazeno</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="165"/> + <source>conflict</source> + <translation>konflikt</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="156"/> + <source>external</source> + <translation>externí</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="157"/> + <source>ignored</source> + <translation>ignorováno</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="158"/> + <source>unversioned</source> + <translation>mimo verzi</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="159"/> + <source>missing</source> + <translation>chybějící</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="160"/> + <source>type error</source> + <translation>chyba typu</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="161"/> + <source>no</source> + <translation>ne</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="162"/> <source>yes</source> <translation>ano</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>Chyba v procesu generování</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>Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> - <source>There are no uncommitted changes available/selected.</source> - <translation>Nezapsané změny nejsou dostupné/vybrané.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <source>There are no uncommitted changes available/selected.</source> + <translation>Nezapsané změny nejsou dostupné/vybrané.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="702"/> <source>There are no unlocked files available/selected.</source> <translation>Odemčené soubory nejsou dostupné/vybrané.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="752"/> <source>There are no locked files available/selected.</source> <translation>Zamčené soubory nejsou dostupné/vybrané.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="716"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="735"/> <source>Break Lock</source> <translation>Prolomit zámek</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>Scizit zámek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="83"/> - <source>Add to repository</source> - <translation>Přidat do repozitáře</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="87"/> + <source>Add to repository</source> + <translation>Přidat do repozitáře</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="91"/> <source>Revert changes</source> <translation>Vrátit změny</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="605"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/> <source>Add</source> <translation>Přidat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="605"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/> <source>There are no unversioned entries available/selected.</source> <translation>Položky mimo verzi nejsou dostupné/vybrány.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="647"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> <source>Revert</source> <translation>Vrátit</translation> </message> @@ -38997,27 +39007,27 @@ <translation>Seznam změn</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>Přidat do seznamu změn</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>Odebrat ze seznamu změn</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>Nejsou dostupné/vybrány soubory, které nepatří do seznamu změn.</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>Nejsou dostupné/vybrány soubory, které patří do seznamu změn.</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>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> @@ -39082,17 +39092,17 @@ <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> @@ -39102,20 +39112,30 @@ <translation type="obsolete">Odlišnosti</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">Chybějící záznamy nejsou dostupné/vybrány.</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>
diff -r 74fc87c7b7a8 -r d051b9d1426d i18n/eric5_de.ts --- a/i18n/eric5_de.ts Mon Sep 05 19:30:37 2011 +0200 +++ b/i18n/eric5_de.ts Mon Sep 05 20:01:12 2011 +0200 @@ -5513,67 +5513,67 @@ <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="13"/> + <location filename="UI/DiffDialog.ui" line="14"/> <source>File Differences</source> <translation>Dateiunterschiede</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="21"/> + <location filename="UI/DiffDialog.ui" line="22"/> <source>File &1:</source> <translation>Datei &1:</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>Gib den Namen der ersten Datei ein</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>Drücken, um eine Datei mittels eines Dateiauswahldialoges zu wählen</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="72"/> - <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="UI/DiffDialog.ui" line="52"/> + <location filename="UI/DiffDialog.ui" line="73"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="UI/DiffDialog.ui" line="53"/> <source>File &2:</source> <translation>Datei &2:</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>Gib den Namen der zweiten Datei ein</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>Auswählen, um einen Unified Diff zu erzeugen</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="90"/> + <location filename="UI/DiffDialog.ui" line="91"/> <source>&Unified Diff</source> <translation>&Unified Diff</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="93"/> + <location filename="UI/DiffDialog.ui" line="94"/> <source>Alt+U</source> <translation>Alt+U</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>Auswählen, um einen Context Diff zu erzeugen</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="106"/> + <location filename="UI/DiffDialog.ui" line="107"/> <source>Co&ntext Diff</source> <translation>&Context Diff</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="109"/> + <location filename="UI/DiffDialog.ui" line="110"/> <source>Alt+N</source> <translation>Alt+C</translation> </message> @@ -15406,7 +15406,7 @@ <translation>Setze abgebrochene Transaktion zurück</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>Soll das Arbeitsverzeichnis aktualisiert werden?</translation> </message> @@ -15421,17 +15421,17 @@ <translation>Änderungsgruppe erzeugen</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>Änderungsgruppen anwenden</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>Ungültiger Bisect Unterbefehl ({0}).</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>Mercurial Bisect ({0})</translation> </message> @@ -15456,7 +15456,7 @@ <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></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>Lösche Dateien nur aus dem Mercurial Repository</translation> </message> @@ -15466,7 +15466,7 @@ <translation>Mercurial Änderungsgruppendateien (*.hg)</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>Mercurial Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation> </message> @@ -15476,12 +15476,12 @@ <translation>Identifiziere Änderungsgruppendatei</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>Änderungssatz umkehren</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>Keine Revision angegeben. Abbruch...</translation> </message> @@ -15491,12 +15491,12 @@ <translation><p>Die Mercurial Änderungsgruppendatei <b>{0}</b> existiert bereits. Überschreiben?</p></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>Letzte Transaktion zurücksetzen</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>Wollen sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> @@ -15506,17 +15506,17 @@ <translation>Pflege Änderungen in das Mercurial Repository ein</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>Mercurial Befehlsserver</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><p>Der Mercurial Befehlsserver konnte nicht wiedergestartet werden.</p><p>Ursache: {0}</p></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><p>Der Mercurial Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> @@ -16352,41 +16352,41 @@ <translation>Quelle:</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>Zeigt den Namen der Quelle</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><b>Quellname</b> <p>Dieses Feld zeigt den namen der Quelle an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="60"/> <source>Enter the target name</source> <translation>Gib den Zielnamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="66"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> <source><b>Target name</b> <p>Enter the new name in this field.</p></source> <translation><b>Zielname</b> <p>Gib den Zielnamen in dieses Feld ein.</p></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>Ziel:</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="80"/> + <source>Select to force the operation</source> + <translation>Auswählen, um die Operation zu erzwingen</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="83"/> - <source>Select to force the operation</source> - <translation>Auswählen, um die Operation zu erzwingen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="86"/> <source>Enforce operation</source> <translation>Operation erzwingen</translation> </message> @@ -16482,52 +16482,52 @@ <translation>Unterschiede</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><b>Mercurial Diff</b><p>Die zeigt die Ausgabe des hg diff Befehls.</p></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>Fehler</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>Eingabe</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="104"/> + <source>Press to send the input to the hg process</source> + <translation>Drücken um die Eingabe an den hg Prozess zu senden</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="107"/> - <source>Press to send the input to the hg process</source> - <translation>Drücken um die Eingabe an den hg Prozess zu senden</translation> + <source>&Send</source> + <translation>Sen&den</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="110"/> - <source>&Send</source> - <translation>Sen&den</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="113"/> <source>Alt+S</source> <translation>Alt+D</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>Gib die Daten ein, die an den hg Prozess geschickt werden sollen</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="124"/> + <source>Select to switch the input field to password mode</source> + <translation>Anwählen, um den Kennwort Modus für das Eingabefeld auszuwählen</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="127"/> - <source>Select to switch the input field to password mode</source> - <translation>Anwählen, um den Kennwort Modus für das Eingabefeld auszuwählen</translation> + <source>&Password Mode</source> + <translation>&Kennwort Modus</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="130"/> - <source>&Password Mode</source> - <translation>&Kennwort Modus</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="133"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> @@ -18403,7 +18403,7 @@ <translation>Erzeuge eine Änderungsgruppendatei für Änderungssätze</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>Änderungsgruppen anwenden</translation> </message> @@ -18633,7 +18633,7 @@ <translation>Pull</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>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> @@ -19750,7 +19750,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>Mercurial Status</translation> </message> @@ -19832,102 +19832,102 @@ <translation>Änderungen einpflegen...</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>Zum Repository hinzufügen</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>Änderungen rückgängig</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>Spaltengrößen anpassen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> - <source>added</source> - <translation>hinzugefügt</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> - <source>modified</source> - <translation>modifiziert</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> + <source>added</source> + <translation>hinzugefügt</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="107"/> + <source>modified</source> + <translation>modifiziert</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="108"/> <source>removed</source> <translation>gelöscht</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> + <source>not tracked</source> + <translation>nicht versioniert</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> - <source>not tracked</source> - <translation>nicht versioniert</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> <source>normal</source> <translation>normal</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> - <source>ignored</source> - <translation>ignoriert</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <source>ignored</source> + <translation>ignoriert</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="110"/> <source>missing</source> <translation>fehlt</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>Fehler beim Prozessstart</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>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</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>Einpflegen</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>Es sind keine nicht eingepflegten Änderungen vorhanden/ausgewählt.</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>Hinzufügen</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>Es sind keine unversionierten Einträge vorhanden/ausgewählt.</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>Rückgängig machen</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>Vom Repository löschen</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>Entfernen</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>Es sind keine fehlenden Einträge vorhanden/ausgewählt.</translation> </message> @@ -20002,30 +20002,40 @@ <translation>&Wiederherstellen</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>Unterschiede anzeigen</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>Fehlende wiederherstellen</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>alle</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>Unterschiede</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>Es sind keine Einträge zum Einpflegen ausgewählt.</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="65"/> + <source>Select all for commit</source> + <translation>Alle zum Einpflegen auswählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="67"/> + <source>Deselect all from commit</source> + <translation>Alle vom Einpflegen abwählen</translation> + </message> </context> <context> <name>HgStatusMonitorThread</name> @@ -35742,73 +35752,73 @@ <translation>Wähle Ziel aus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="13"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="14"/> <source>Subversion Copy</source> <translation>Subversion Kopieren</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>Drücken, um einen Auswahldialog zu öffnen</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><b>Zielverzeichnis</b> <p>Auswahl des Zielverzeichnisses mit Hilfe eines Verzeichnisauswahldialoges.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="34"/> - <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="41"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="35"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="42"/> <source>Source:</source> <translation>Quelle:</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>Zeigt den Namen der Quelle</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><b>Quellname</b> <p>Dieses Feld zeigt den namen der Quelle an.</p></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>Gib den Zielnamen ein</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><b>Zielname</b> <p>Gib den Zielnamen in dieses Feld ein.</p></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>Ziel:</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>Auswählen, um die Operation zu erzwingen</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>Operation erzwingen</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><b>Zielname</b> @@ -35958,57 +35968,57 @@ <translation><p>Die Patchdatei <b>{0}</b> konnte nicht gespeichert werden.<br>Grund: {1}</p></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>Unterschiede</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><b>Subversion Diff</b><p>Die zeigt die Ausgabe des svn diff Befehls.</p></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>Fehler</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>Eingabe</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>Drücken um die Eingabe an den Subversion Prozess zu senden</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>Sen&den</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>Alt+D</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>Gib die Daten ein, die an den Subversion Prozess geschickt werden sollen</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>Anwählen, um den Kennwort Modus für das Eingabefeld auszuwählen</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>&Kennwort Modus</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>Alt+P</translation> </message> @@ -38010,67 +38020,67 @@ <context> <name>SvnStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="159"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="163"/> <source>normal</source> <translation>normal</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>hinzugefügt</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>gelöscht</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="164"/> + <source>modified</source> + <translation>modifiziert</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="165"/> + <source>conflict</source> + <translation>Konflikt</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="158"/> + <source>unversioned</source> + <translation>unversioniert</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="159"/> + <source>missing</source> + <translation>fehlt</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="160"/> - <source>modified</source> - <translation>modifiziert</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="161"/> - <source>conflict</source> - <translation>Konflikt</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> - <source>unversioned</source> - <translation>unversioniert</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="155"/> - <source>missing</source> - <translation>fehlt</translation> + <source>type error</source> + <translation>Typfehler</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="161"/> + <source>no</source> + <translation>nein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="162"/> + <source>yes</source> + <translation>ja</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="156"/> - <source>type error</source> - <translation>Typfehler</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="157"/> - <source>no</source> - <translation>nein</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="158"/> - <source>yes</source> - <translation>ja</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="152"/> <source>external</source> <translation>Extern</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="153"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="157"/> <source>ignored</source> <translation>ignoriert</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="279"/> <source>Subversion Status</source> <translation>Subversion Status</translation> </message> @@ -38080,82 +38090,82 @@ <translation>Änderungen einpflegen...</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>Einpflegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> - <source>There are no uncommitted changes available/selected.</source> - <translation>Es sind keine nicht eingepflegten Änderungen vorhanden/ausgewählt.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <source>There are no uncommitted changes available/selected.</source> + <translation>Es sind keine nicht eingepflegten Änderungen vorhanden/ausgewählt.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="702"/> <source>Lock</source> <translation>Sperren</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>Entsperren</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>Sperre brechen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="111"/> <source>Steal lock</source> <translation>Sperre stehlen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="155"/> <source>locked</source> <translation>gesperrt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="152"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="156"/> <source>other lock</source> <translation>fremdgesperrt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="153"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="157"/> <source>stolen lock</source> <translation>Sperre gestohlen</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="158"/> + <source>broken lock</source> + <translation>Sperre gebrochen</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="154"/> - <source>broken lock</source> - <translation>Sperre gebrochen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="150"/> <source>not locked</source> <translation>nicht gesperrt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> <source>replaced</source> <translation>ersetzt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="702"/> <source>There are no unlocked files available/selected.</source> <translation>Es sind keine ungesperrten Dateien vorhanden/ausgewählt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="752"/> <source>There are no locked files available/selected.</source> <translation>Es sind keine gesperrten Dateien vorhanden/ausgewählt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="716"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="735"/> <source>Break Lock</source> <translation>Sperre brechen</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>Sperre stehlen</translation> </message> @@ -38272,12 +38282,12 @@ <translation>Drücken, um die Statusanzeige zu erneuern</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="111"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="115"/> <source>Adjust column sizes</source> <translation>Spaltengrößen anpassen</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>Fehler beim Prozessstart</translation> </message> @@ -38287,32 +38297,32 @@ <translation>Erneuern</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>Zum Repository hinzufügen</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>Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="605"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/> <source>Add</source> <translation>Hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="605"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/> <source>There are no unversioned entries available/selected.</source> <translation>Es sind keine unversionierten Einträge vorhanden/ausgewählt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="647"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> <source>Revert</source> <translation>Rückgängig machen</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>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> @@ -38322,22 +38332,22 @@ <translation>Änderungsliste</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>Zu Änderungsliste hinzufügen</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>Von Änderungsliste entfernen</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>Es sind keine Dateien vorhanden/ausgewählt, die nicht zu einer Änderungsliste gehören.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="767"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="786"/> <source>There are no files available/selected belonging to a changelist.</source> <translation>Es sind keine Dateien vorhanden/ausgewählt, die zu einer Änderungsliste gehören.</translation> </message> @@ -38402,35 +38412,45 @@ <translation>&Wiederherstellen</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>Unterschiede anzeigen</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>Fehlende wiederherstellen</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>alle</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>Unterschiede</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>Es sind keine Einträge zum Einpflegen ausgewählt.</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>Es sind keine fehlenden Einträge vorhanden/ausgewählt.</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="82"/> + <source>Select all for commit</source> + <translation>Alle zum Einpflegen auswählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="84"/> + <source>Deselect all from commit</source> + <translation>Alle vom Einpflegen abwählen</translation> + </message> </context> <context> <name>SvnStatusMonitorThread</name>
diff -r 74fc87c7b7a8 -r d051b9d1426d i18n/eric5_en.ts --- 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>
diff -r 74fc87c7b7a8 -r d051b9d1426d i18n/eric5_es.ts --- a/i18n/eric5_es.ts Mon Sep 05 19:30:37 2011 +0200 +++ b/i18n/eric5_es.ts Mon Sep 05 20:01:12 2011 +0200 @@ -5506,67 +5506,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>Diferencias entre Archivos</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="21"/> + <location filename="UI/DiffDialog.ui" line="22"/> <source>File &1:</source> <translation>Archivo &1:</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>Introduzca el nombre del primer archivo</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>Pulse para seleccionar el archivo utilizando un diálogo de selección de archivos</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="72"/> - <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="UI/DiffDialog.ui" line="52"/> + <location filename="UI/DiffDialog.ui" line="73"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="UI/DiffDialog.ui" line="53"/> <source>File &2:</source> <translation>Archivo &2:</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>Introduzca el nombre del segundo archivo</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>Seleccionar para generar un diff unificado</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="90"/> + <location filename="UI/DiffDialog.ui" line="91"/> <source>&Unified Diff</source> <translation>Diff &Unificado</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="93"/> + <location filename="UI/DiffDialog.ui" line="94"/> <source>Alt+U</source> <translation>Alt+U</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>Seleccionar para generar un diff de contexto</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="106"/> + <location filename="UI/DiffDialog.ui" line="107"/> <source>Co&ntext Diff</source> <translation>Diff de Co&ntexto</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="109"/> + <location filename="UI/DiffDialog.ui" line="110"/> <source>Alt+N</source> <translation>Alt+N</translation> </message> @@ -15591,7 +15591,7 @@ <translation>Recuperando de transacción interrumpida</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>¿Debe ser actualizado el directorio de trabajo?</translation> </message> @@ -15606,17 +15606,17 @@ <translation>Crear changegroup</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>Aplicar changegroups</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>Subcomando bisect ({0}) inválido.</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>Mercurial Bisect ({0})</translation> </message> @@ -15641,7 +15641,7 @@ <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></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>Eliminando archivos unicamente del repositorio Mercurial</translation> </message> @@ -15651,7 +15651,7 @@ <translation>Archivos Changegroup de Mercurial (*.hg)</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>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</translation> </message> @@ -15661,12 +15661,12 @@ <translation>Identificando archivo de changegroup</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>Haciendo respaldo de changeset</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>No se ha proporcionado revisión. Abortando...</translation> </message> @@ -15676,12 +15676,12 @@ <translation><p>El archivo changegroup de Mercurial <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2328"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2335"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</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>¿Está seguro de que quiere aplicar un rollback a la última transacción?</translation> </message> @@ -15691,17 +15691,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> @@ -16567,41 +16567,41 @@ <translation>Origen:</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>Muestra el nombre del origen</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><b>Nombre de origen</b> <p>Este campo muestra el nombre del origen.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="60"/> <source>Enter the target name</source> <translation>Introduzca el nombre de destino</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="66"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> <source><b>Target name</b> <p>Enter the new name in this field.</p></source> <translation><b>Nombre de destino</b> <p>Introduzca el nuevo nombre en este campo.</p></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>Destino:</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="80"/> + <source>Select to force the operation</source> + <translation>Seleccionar para forzar la operación</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="83"/> - <source>Select to force the operation</source> - <translation>Seleccionar para forzar la operación</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="86"/> <source>Enforce operation</source> <translation>Imponer operación</translation> </message> @@ -16697,52 +16697,52 @@ <translation>Diferencia</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><b>Diff de Mercurial</b><p>Muestra la salida del comando hg diff.</p></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>Errores</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>Input</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="104"/> + <source>Press to send the input to the hg process</source> + <translation>Pulse para enviar el input al proceso de hg</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="107"/> - <source>Press to send the input to the hg process</source> - <translation>Pulse para enviar el input al proceso de hg</translation> + <source>&Send</source> + <translation>&Enviar</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="110"/> - <source>&Send</source> - <translation>&Enviar</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="113"/> <source>Alt+S</source> <translation>Alt+S</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>Introduzca los datos a enviar al proceso de hg</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="124"/> + <source>Select to switch the input field to password mode</source> + <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="127"/> - <source>Select to switch the input field to password mode</source> - <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> + <source>&Password Mode</source> + <translation>&Modo de contraseña</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="130"/> - <source>&Password Mode</source> - <translation>&Modo de contraseña</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="133"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> @@ -18679,7 +18679,7 @@ <translation>Crea un archivo de changegroup recogiendo changesets</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>Aplicar changegroups</translation> </message> @@ -18919,7 +18919,7 @@ <translation>Hacer Pull</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>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> @@ -20041,7 +20041,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>Mercurial Status</translation> </message> @@ -20123,102 +20123,102 @@ <translation>Hacer commit de los cambios al repositorio...</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>Añadir al repositorio</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>Revertir cambios</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>Adjustar tamaño de columnas</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> - <source>added</source> - <translation>añadido</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> - <source>modified</source> - <translation>modificado</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> + <source>added</source> + <translation>añadido</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="107"/> + <source>modified</source> + <translation>modificado</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="108"/> <source>removed</source> <translation>eliminado</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> + <source>not tracked</source> + <translation>sin seguimiento</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> - <source>not tracked</source> - <translation>sin seguimiento</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> <source>normal</source> <translation>normal</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> - <source>ignored</source> - <translation>ignorado</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <source>ignored</source> + <translation>ignorado</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="110"/> <source>missing</source> <translation>perdido</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>Error de Generación de Proceso</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>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="540"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="547"/> <source>Commit</source> <translation>Commit</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>No hay cambios pendientes de commit disponibles/seleccionados.</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>Añadir</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>No hay entradas sin versionar disponibles/seleccionadas.</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>Revertir</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>Eliminar de repositorio</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>Eliminar</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>No hay entradas perdidas disponibles/seleccionadas.</translation> </message> @@ -20293,17 +20293,17 @@ <translation>&Restore</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>Mostrar diferencias</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>Restore sobre elementos perdidos</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>todo</translation> </message> @@ -20313,15 +20313,25 @@ <translation type="obsolete">Diferencia</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>Diferencias</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>No hay entradas seleccionadas sobre las que aplicar commit.</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> @@ -36000,70 +36010,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>Copy de Subversion</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>Pulse para abrir un diálogo de selección</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><b>Directorio de destino</b><p>Seleccione el nombre de destino para la operación a través de un diálogo de selección.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="34"/> - <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="41"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="35"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="42"/> <source>Source:</source> <translation>Origen:</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>Muestra el nombre del origen</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><b>Nombre de origen</b><p>Este campo muestra el nombre del origen.</p></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>Introduzca el nombre de destino</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><b>Nombre de destino</b><p>Introduzca el nuevo nombre en este campo.</p></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>Destino:</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>Seleccionar para forzar la operación</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>Imponer operación</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><b>Nombre de destino</b> @@ -36202,57 +36212,57 @@ <translation>Diff de Subversion</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>Diferencia</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><b>Diff de Subversion</b><p>Muestra la salida del comando svn diff.</p></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>Errores</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>Input</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>Pulsar para enviar el input al proceso de subversion</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>&Enviar</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>Alt+E</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>Introducir datos a enviar al proceso de subversion</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>Seleccionar para cambiar el campo de input a modo contraseña</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>&Modo de contraseña</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>Alt+M</translation> </message> @@ -38290,7 +38300,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>Estado de Subversion</translation> </message> @@ -38417,177 +38427,177 @@ <translation>Hacer commit de los cambios al repositorio...</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>Añadir al repositorio</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>Revertir cambios</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>Bloquear</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>Desbloquear</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>Romper bloqueo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="107"/> - <source>Steal lock</source> - <translation>Robar bloqueo</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="111"/> + <source>Steal lock</source> + <translation>Robar bloqueo</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="115"/> <source>Adjust column sizes</source> <translation>Adjustar tamaño de columnas</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>añadido</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>borrado</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>modificado</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="158"/> + <source>unversioned</source> + <translation>sin versionar</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="155"/> + <source>locked</source> + <translation>bloqueado</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="156"/> + <source>other lock</source> + <translation>otro bloqueo</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="157"/> + <source>stolen lock</source> + <translation>bloqueo robado</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="158"/> + <source>broken lock</source> + <translation>bloqueo roto</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="154"/> + <source>not locked</source> + <translation>no bloqueado</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="163"/> + <source>normal</source> + <translation>normal</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> - <source>unversioned</source> - <translation>sin versionar</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="151"/> - <source>locked</source> - <translation>bloqueado</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="152"/> - <source>other lock</source> - <translation>otro bloqueo</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="153"/> - <source>stolen lock</source> - <translation>bloqueo robado</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="154"/> - <source>broken lock</source> - <translation>bloqueo roto</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="150"/> - <source>not locked</source> - <translation>no bloqueado</translation> + <source>replaced</source> + <translation>reemplazado</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="165"/> + <source>conflict</source> + <translation>conflicto</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="156"/> + <source>external</source> + <translation>externo</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="157"/> + <source>ignored</source> + <translation>ignorado</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="159"/> - <source>normal</source> - <translation>normal</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="150"/> - <source>replaced</source> - <translation>reemplazado</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="161"/> - <source>conflict</source> - <translation>conflicto</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="152"/> - <source>external</source> - <translation>externo</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="153"/> - <source>ignored</source> - <translation>ignorado</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="155"/> <source>missing</source> <translation>perdido</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>error de tipo</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>no</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>si</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>Error de Generación de Proceso</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>Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> - <source>There are no uncommitted changes available/selected.</source> - <translation>No hay cambios pendientes de commit disponibles/seleccionados.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="605"/> - <source>Add</source> - <translation>Añadir</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="605"/> - <source>There are no unversioned entries available/selected.</source> - <translation>No hay entradas sin versionar disponibles/seleccionadas.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="647"/> - <source>Revert</source> - <translation>Revertir</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <source>There are no uncommitted changes available/selected.</source> + <translation>No hay cambios pendientes de commit disponibles/seleccionados.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/> + <source>Add</source> + <translation>Añadir</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/> + <source>There are no unversioned entries available/selected.</source> + <translation>No hay entradas sin versionar disponibles/seleccionadas.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> + <source>Revert</source> + <translation>Revertir</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="702"/> <source>There are no unlocked files available/selected.</source> <translation>No hay archivos desbloqueados disponibles/seleccionados.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="752"/> <source>There are no locked files available/selected.</source> <translation>No hay archivos bloqueados disponibles/seleccionados.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="716"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="735"/> <source>Break Lock</source> <translation>Romper Bloqueo</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>Robar Bloqueo</translation> </message> @@ -38597,27 +38607,27 @@ <translation>Lista de cambios</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>Añadir a la lista de cambios</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>Quitar de la lista de cambios</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>No hay archivos disponibles/seleccionados que no pertenezcan a una lista de cambios.</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>No hay archivos disponibles/seleccionados que pertenezcan a una lista de cambios.</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>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -38682,17 +38692,17 @@ <translation>&Restore</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>Mostrar diferencias</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>Restaurar perdidas</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>todo</translation> </message> @@ -38702,20 +38712,30 @@ <translation type="obsolete">Diferencia</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>Diferencias</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>No hay entradas seleccionads sobre las que hacer commit.</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>No hay entradas perdidas disponibles/seleccionadas.</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>
diff -r 74fc87c7b7a8 -r d051b9d1426d i18n/eric5_fr.ts --- a/i18n/eric5_fr.ts Mon Sep 05 19:30:37 2011 +0200 +++ b/i18n/eric5_fr.ts Mon Sep 05 20:01:12 2011 +0200 @@ -5940,67 +5940,67 @@ <translation type="obsolete"><p>Impossible de lire le fichier <b>%1</b>.</p></translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="13"/> + <location filename="UI/DiffDialog.ui" line="14"/> <source>File Differences</source> <translation>Différences entre fichiers</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="21"/> + <location filename="UI/DiffDialog.ui" line="22"/> <source>File &1:</source> <translation>Fichier &1:</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>Entrer le nom du premier fichier</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>Cliquer pour sélectionner un fichier via une boite de dialogue</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="72"/> + <location filename="UI/DiffDialog.ui" line="73"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="52"/> + <location filename="UI/DiffDialog.ui" line="53"/> <source>File &2:</source> <translation>Fichier &2:</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>Entrer le nom du deuxième fichier</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>Cocher pour faire apparaitre les différences sur des lignes acolées successives</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="90"/> + <location filename="UI/DiffDialog.ui" line="91"/> <source>&Unified Diff</source> <translation>Diff &unifié</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="93"/> + <location filename="UI/DiffDialog.ui" line="94"/> <source>Alt+U</source> <translation>Alt+U</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>Cocher pour faire apparaitre les différences de façon séparée, dans leur contexte</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="106"/> + <location filename="UI/DiffDialog.ui" line="107"/> <source>Co&ntext Diff</source> <translation>Diff co&ntextuel</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="109"/> + <location filename="UI/DiffDialog.ui" line="110"/> <source>Alt+N</source> <translation>Alt+N</translation> </message> @@ -16911,7 +16911,7 @@ <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> @@ -16926,17 +16926,17 @@ <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="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> @@ -16961,7 +16961,7 @@ <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> @@ -16971,7 +16971,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> @@ -16981,12 +16981,12 @@ <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> @@ -16996,12 +16996,12 @@ <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> @@ -17011,17 +17011,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> @@ -17865,41 +17865,41 @@ <translation type="unfinished">Source:</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">Affiche le nom de la source</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"><b>Source name</b> <p>Ce champ donne le nom de la source.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="60"/> <source>Enter the target name</source> <translation type="unfinished">Entrer le nom de la cible</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="66"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> <source><b>Target name</b> <p>Enter the new name in this field.</p></source> <translation type="unfinished"><b>Nom de la cible</b> <p>Entrer un nouveau nom dans ce champ.</p></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">Cible:</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="80"/> + <source>Select to force the operation</source> + <translation type="unfinished">Cocher pour forcer l'opération</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="83"/> - <source>Select to force the operation</source> - <translation type="unfinished">Cocher pour forcer l'opération</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="86"/> <source>Enforce operation</source> <translation type="unfinished">Forcer l'opération</translation> </message> @@ -17995,52 +17995,52 @@ <translation type="unfinished">Différence</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">Erreurs</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">Entrée</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> - <translation type="unfinished"></translation> + <source>&Send</source> + <translation type="unfinished">&Envoyer</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="110"/> - <source>&Send</source> - <translation type="unfinished">&Envoyer</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">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="127"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> + <source>&Password Mode</source> + <translation type="unfinished">Mode Mot de &Passe</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="130"/> - <source>&Password Mode</source> - <translation type="unfinished">Mode Mot de &Passe</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="133"/> <source>Alt+P</source> <translation type="unfinished">Alt+P</translation> </message> @@ -19951,7 +19951,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> @@ -20181,7 +20181,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> @@ -21301,7 +21301,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> @@ -21382,102 +21382,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="72"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="76"/> <source>Revert changes</source> <translation type="unfinished">Revenir avant les modifications</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">Ajuster la largeur des colonnes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> - <source>added</source> - <translation type="unfinished">ajouté</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> - <source>modified</source> - <translation type="unfinished">modifié</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> + <source>added</source> + <translation type="unfinished">ajouté</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="107"/> + <source>modified</source> + <translation type="unfinished">modifié</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="105"/> - <source>not tracked</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> <source>normal</source> <translation type="unfinished">normal</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> - <source>ignored</source> - <translation type="unfinished">ignoré</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <source>ignored</source> + <translation type="unfinished">ignoré</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="110"/> <source>missing</source> <translation type="unfinished">manquant</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">Erreur du processus</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">Commit</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">Il n'y a pas de modification non commitée disponible/sélectionnée.</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">Ajouter</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">Aucune entrée "non-versionnée" disponible/sélectionnée.</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">Recouvrir</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="588"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="607"/> <source>Remove</source> <translation type="unfinished">Supprimer</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> @@ -21552,17 +21552,17 @@ <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> @@ -21572,15 +21572,25 @@ <translation type="obsolete">Différence</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> @@ -39312,73 +39322,73 @@ <translation>Sélectionner la cible</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="13"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="14"/> <source>Subversion Copy</source> <translation>Copie Subversion</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>Cliquer pour choisir un fichier</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><b>Répertoire cible</b> <p>Selectionne manuellement le nom de la cible.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="34"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="35"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="41"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="42"/> <source>Source:</source> <translation>Source:</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>Affiche le nom de la source</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><b>Source name</b> <p>Ce champ donne le nom de la source.</p></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>Entrer le nom de la cible</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><b>Nom de la cible</b> <p>Entrer un nouveau nom dans ce champ.</p></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>Cible:</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>Cocher pour forcer l'opération</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>Forcer l'opération</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><b>Répertoire cible</b><p>Selectionne manuellement le nom de la cible.</p></translation> @@ -39554,57 +39564,57 @@ <translation type="obsolete"><p>Impossible d'enregistrer le fichier patch <b>%1</b>.<br>Raison: %2</p></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>Différence</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><b>Diff Subversion</b><p>Affiche le résultat de la commande svn diff.</p></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>Erreurs</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>Entrée</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>Cliquer pour envoyer l'entrée saisie au processus Subversion</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>&Envoyer</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>Alt+E</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>Entrer les données à envoyer au processus Subversion</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>Cocher pour basculer le champ d'entrée en mode Mot de Passe</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>Mode Mot de &Passe</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>Alt+P</translation> </message> @@ -41788,67 +41798,67 @@ <context> <name>SvnStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="159"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="163"/> <source>normal</source> <translation>normal</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>ajouté</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>effacé</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="164"/> + <source>modified</source> + <translation>modifié</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="165"/> + <source>conflict</source> + <translation>conflit</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="158"/> + <source>unversioned</source> + <translation>sans version</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="159"/> + <source>missing</source> + <translation>manquant</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="160"/> - <source>modified</source> - <translation>modifié</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="161"/> - <source>conflict</source> - <translation>conflit</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> - <source>unversioned</source> - <translation>sans version</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="155"/> - <source>missing</source> - <translation>manquant</translation> + <source>type error</source> + <translation>erreur de type</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="161"/> + <source>no</source> + <translation>non</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="162"/> + <source>yes</source> + <translation>oui</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="156"/> - <source>type error</source> - <translation>erreur de type</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="157"/> - <source>no</source> - <translation>non</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="158"/> - <source>yes</source> - <translation>oui</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="152"/> <source>external</source> <translation>exterieur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="153"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="157"/> <source>ignored</source> <translation>ignoré</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="279"/> <source>Subversion Status</source> <translation>Status Subversion</translation> </message> @@ -41858,82 +41868,82 @@ <translation>Commit des changements dans le référentiel...</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>Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> - <source>There are no uncommitted changes available/selected.</source> - <translation>Il n'y a pas de modification non commitée disponible/sélectionnée.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <source>There are no uncommitted changes available/selected.</source> + <translation>Il n'y a pas de modification non commitée disponible/sélectionnée.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="702"/> <source>Lock</source> <translation>Verrouillage</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>Déverrouillage</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>Casser le verrouillage d'un autre utilisateur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="111"/> <source>Steal lock</source> <translation>Reverrouiller à son nom</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="155"/> <source>locked</source> <translation>verrouillé</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="152"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="156"/> <source>other lock</source> <translation>autre verrou</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="153"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="157"/> <source>stolen lock</source> <translation>verrou volé</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="158"/> + <source>broken lock</source> + <translation>verrou cassé</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="154"/> - <source>broken lock</source> - <translation>verrou cassé</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="150"/> <source>not locked</source> <translation>non verrouilé</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> <source>replaced</source> <translation>remplacé</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="702"/> <source>There are no unlocked files available/selected.</source> <translation>Il n'y a aucun fichier déverrouilé disponible/sélectionné.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="752"/> <source>There are no locked files available/selected.</source> <translation>Il n'y a aucun fichier verrouilé disponible/sélectionné.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="716"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="735"/> <source>Break Lock</source> <translation>Casser le verrouillage d'un autre utilisateur</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>Voler le verrou</translation> </message> @@ -42050,12 +42060,12 @@ <translation>Cliquer pour rafraichir l'affichage</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="111"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="115"/> <source>Adjust column sizes</source> <translation>Ajuster la largeur des colonnes</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>Erreur du processus</translation> </message> @@ -42065,27 +42075,27 @@ <translation>Rafraichir</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>Ajouter au référentiel</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>Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="605"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/> <source>Add</source> <translation>Ajouter</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="605"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/> <source>There are no unversioned entries available/selected.</source> <translation>Aucune entrée "non-versionnée" disponible/sélectionnée.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="647"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> <source>Revert</source> <translation>Recouvrir</translation> </message> @@ -42100,27 +42110,27 @@ <translation>Liste des modifications</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>Ajouter à la liste des modifications</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>Supprimer de la liste des modifications</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>Il n'y a pas de fichiers disponibles ou sélectionnés n'appartenant pas à une liste.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="767"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="786"/> <source>There are no files available/selected belonging to a changelist.</source> <translation>Il n'y a pas de fichiers disponibles ou sélectionnés appartenant à une liste.</translation> </message> <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> @@ -42185,17 +42195,17 @@ <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> @@ -42205,20 +42215,30 @@ <translation type="obsolete">Différence</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>
diff -r 74fc87c7b7a8 -r d051b9d1426d i18n/eric5_it.ts --- a/i18n/eric5_it.ts Mon Sep 05 19:30:37 2011 +0200 +++ b/i18n/eric5_it.ts Mon Sep 05 20:01:12 2011 +0200 @@ -5527,67 +5527,67 @@ <translation>Seleziona file da confrontare</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="13"/> + <location filename="UI/DiffDialog.ui" line="14"/> <source>File Differences</source> <translation>File differenze</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="21"/> + <location filename="UI/DiffDialog.ui" line="22"/> <source>File &1:</source> <translation>File &1:</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>Inserisci il nome del primo file</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>Premi per selezionare il file con un dialogo</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="72"/> - <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="UI/DiffDialog.ui" line="52"/> + <location filename="UI/DiffDialog.ui" line="73"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="UI/DiffDialog.ui" line="53"/> <source>File &2:</source> <translation>File &2:</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>Inserisci il nome del secondo file</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>Seleziona per generare una unified diff</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="90"/> + <location filename="UI/DiffDialog.ui" line="91"/> <source>&Unified Diff</source> <translation>&Unified Diff</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="93"/> + <location filename="UI/DiffDialog.ui" line="94"/> <source>Alt+U</source> <translation>Alt+U</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>Seleziona per generare una contexr diff</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="106"/> + <location filename="UI/DiffDialog.ui" line="107"/> <source>Co&ntext Diff</source> <translation>Co&ntext Diff</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="109"/> + <location filename="UI/DiffDialog.ui" line="110"/> <source>Alt+N</source> <translation>Alt+N</translation> </message> @@ -15530,7 +15530,7 @@ <translation>Recupero da una transazione interrotta</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>Le directory di lavoro devono essere aggiornate ?</translation> </message> @@ -15545,17 +15545,17 @@ <translation>Crea changegroup</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>Applica changegroup</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>Sottocomando Bisect ({0}) non valido.</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>Mercurial Bisect ({0})</translation> </message> @@ -15580,7 +15580,7 @@ <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></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>Rimozione di file dal solo repository Mercurial</translation> </message> @@ -15590,7 +15590,7 @@ <translation>Mercurial Changegroup Files (*.hg)</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>Mercurial Changegroup Files (*.hg);;All Files (*)</translation> </message> @@ -15600,12 +15600,12 @@ <translation>Identifica i file changegroup</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>Ritiro changeset</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>Nessuna revisione fornita. Termino...</translation> </message> @@ -15615,12 +15615,12 @@ <translation><p>Il file changegroup di Mercurial<b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="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> @@ -15630,17 +15630,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> @@ -16502,41 +16502,41 @@ <translation>Sorgente:</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>Mostra il nome della sorgente</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><b>Nome sorgente</b> <p>Questo campo mostra il nome della sorgente.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="60"/> <source>Enter the target name</source> <translation>Inserisci il nome del target</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="66"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> <source><b>Target name</b> <p>Enter the new name in this field.</p></source> <translation><b>Nome target</b> <p>Inserisci il nuovo nome in questo campo.</p></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>Target:</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="80"/> + <source>Select to force the operation</source> + <translation>Seleziona per forzae l'operazione</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="83"/> - <source>Select to force the operation</source> - <translation>Seleziona per forzae l'operazione</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="86"/> <source>Enforce operation</source> <translation>Forza operazione</translation> </message> @@ -16632,52 +16632,52 @@ <translation>Difference</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><b>Mercurial Diff</b><p>Mostra l'output del comando hg diff.</p></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>Errori</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>Input</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="104"/> + <source>Press to send the input to the hg process</source> + <translation>Premi per spedire l'input al processo hg</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="107"/> - <source>Press to send the input to the hg process</source> - <translation>Premi per spedire l'input al processo hg</translation> + <source>&Send</source> + <translation>&Spedisci</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="110"/> - <source>&Send</source> - <translation>&Spedisci</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="113"/> <source>Alt+S</source> <translation>Alt+S</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>Inserisci i dati da inviare al processo hg</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="124"/> + <source>Select to switch the input field to password mode</source> + <translation>Seleziona per impostare il campo di input in modalità password</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="127"/> - <source>Select to switch the input field to password mode</source> - <translation>Seleziona per impostare il campo di input in modalità password</translation> + <source>&Password Mode</source> + <translation>Modo &Password</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="130"/> - <source>&Password Mode</source> - <translation>Modo &Password</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="133"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> @@ -18613,7 +18613,7 @@ <translation>Crea un file changegroup che colleziona i changeset</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>Applica changegroups</translation> </message> @@ -18853,7 +18853,7 @@ <translation>Pull</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>Il progetto deve essere riletto. Farlo ora ?</translation> </message> @@ -19968,7 +19968,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>Mercurial Status</translation> </message> @@ -20050,102 +20050,102 @@ <translation>Committa le modifica nel repository...</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>Aggiungi al repository</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>Annulla modifiche</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>Adatta dimensione colonne</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> - <source>added</source> - <translation>aggiunto</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> - <source>modified</source> - <translation>modificato</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> + <source>added</source> + <translation>aggiunto</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="107"/> + <source>modified</source> + <translation>modificato</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="108"/> <source>removed</source> <translation>rimosso</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> + <source>not tracked</source> + <translation>non tracciato</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> - <source>not tracked</source> - <translation>non tracciato</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> <source>normal</source> <translation>normale</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> - <source>ignored</source> - <translation>ignorato</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <source>ignored</source> + <translation>ignorato</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="110"/> <source>missing</source> <translation>mancante</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>Errore Generazione Processo</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>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</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>Commit</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>Non ci sono modifiche disponibili/selezionate da committare.</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>Aggiungi</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>Non ci sono elementi non sotto controllo disponibili/selezionati.</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>Inverti</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>Rimuovi dal repository</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>Rimuovi</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>Non ci sono elementi mancati disponibili/selezionati.</translation> </message> @@ -20220,30 +20220,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="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="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="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> @@ -35925,73 +35935,73 @@ <translation>Seleziona target</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="13"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="14"/> <source>Subversion Copy</source> <translation>Subversion Copy</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>Premi per aprire un dialogo di selezione</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><b>Target directory</b> <p>Seleziona il nome per il target per l'operazione con un dialogo.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="34"/> - <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="41"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="35"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="42"/> <source>Source:</source> <translation>Sorgente:</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>Mostra il nome della sorgente</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><b>Nome sorgente</b> <p>Questo campo mostra il nome della sorgente.</p></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>Inserisci il nome del target</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><b>Nome target</b> <p>Inserisci il nuovo nome in questo campo.</p></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>Target:</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>Seleziona per forzae l'operazione</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>Forza operazione</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><b>Nome target</b> @@ -36136,57 +36146,57 @@ <translation>Salva Diff</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>Difference</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><b>Subversion Diff</b><p>Mostra l'output del comando svn diff.</p></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>Errori</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>Input</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>Premi per mandare l'input al processo subversion</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>&Spedisci</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>Alt+S</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>Inserisci i dati da mandare al processo subversion</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>Seleziona per impostare il campo di input in modalità password</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>Modo &Password</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>Alt+P</translation> </message> @@ -38212,67 +38222,67 @@ <context> <name>SvnStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="159"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="163"/> <source>normal</source> <translation>normale</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>aggiunto</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>cancellato</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="164"/> + <source>modified</source> + <translation>modificato</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="165"/> + <source>conflict</source> + <translation>conflitto</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="158"/> + <source>unversioned</source> + <translation>non versionato</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="159"/> + <source>missing</source> + <translation>mancante</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="160"/> - <source>modified</source> - <translation>modificato</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="161"/> - <source>conflict</source> - <translation>conflitto</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> - <source>unversioned</source> - <translation>non versionato</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="155"/> - <source>missing</source> - <translation>mancante</translation> + <source>type error</source> + <translation>errore tipo</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="161"/> + <source>no</source> + <translation>no</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="162"/> + <source>yes</source> + <translation>si</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="156"/> - <source>type error</source> - <translation>errore tipo</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="157"/> - <source>no</source> - <translation>no</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="158"/> - <source>yes</source> - <translation>si</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="152"/> <source>external</source> <translation>esterno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="153"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="157"/> <source>ignored</source> <translation>ignorato</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="279"/> <source>Subversion Status</source> <translation>Stato Subversion</translation> </message> @@ -38282,82 +38292,82 @@ <translation>Committa modifiche nel repository...</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>Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> - <source>There are no uncommitted changes available/selected.</source> - <translation>Non ci sono modifiche disponibili/selezionate da committare.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <source>There are no uncommitted changes available/selected.</source> + <translation>Non ci sono modifiche disponibili/selezionate da committare.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="702"/> <source>Lock</source> <translation>Lock</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>Unlock</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>Spezza lock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="111"/> <source>Steal lock</source> <translation>Ruba lock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="155"/> <source>locked</source> <translation>bloccato</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="152"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="156"/> <source>other lock</source> <translation>altro lock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="153"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="157"/> <source>stolen lock</source> <translation>lock rubato</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="158"/> + <source>broken lock</source> + <translation>lock rotto</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="154"/> - <source>broken lock</source> - <translation>lock rotto</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="150"/> <source>not locked</source> <translation>non bloccato</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> <source>replaced</source> <translation>sostituito</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="702"/> <source>There are no unlocked files available/selected.</source> <translation>Non ci sono file sbloccati disponibili/selezionati.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="752"/> <source>There are no locked files available/selected.</source> <translation>Non ci sono file bloccati disponibili/selezionati.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="716"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="735"/> <source>Break Lock</source> <translation>Spezza lock</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>Ruba lock</translation> </message> @@ -38474,12 +38484,12 @@ <translation>Premi per aggiornare lo stato</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="111"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="115"/> <source>Adjust column sizes</source> <translation>Adatta dimensione colonne</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>Errore Generazione Processo</translation> </message> @@ -38489,27 +38499,27 @@ <translation>Aggiorna</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>Aggiungi al repository</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>Inverti modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="605"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/> <source>Add</source> <translation>Aggiungi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="605"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/> <source>There are no unversioned entries available/selected.</source> <translation>Non ci sono elementi non sotto controllo disponibili/selezionati.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="647"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> <source>Revert</source> <translation>Inverti</translation> </message> @@ -38519,27 +38529,27 @@ <translation>Changelist</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>Aggiungi alla Changelist</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>Rimuovi dalla Changelist</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>Non ci sono file disponibili/selezionati che non appartengono ad una changelist.</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>Non ci sono file disponibili/selezionati che appartengono ad una changelist.</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>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> @@ -38604,35 +38614,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="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">Non ci sono elementi mancati disponibili/selezionati.</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="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>
diff -r 74fc87c7b7a8 -r d051b9d1426d i18n/eric5_ru.ts --- a/i18n/eric5_ru.ts Mon Sep 05 19:30:37 2011 +0200 +++ b/i18n/eric5_ru.ts Mon Sep 05 20:01:12 2011 +0200 @@ -5564,67 +5564,67 @@ <translation><p>Невозможно прочитать файл: <b>{0}</b></p></translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="13"/> + <location filename="UI/DiffDialog.ui" line="14"/> <source>File Differences</source> <translation>Различия файлов</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="21"/> + <location filename="UI/DiffDialog.ui" line="22"/> <source>File &1:</source> <translation>Файл: &1:</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>Задайте имя первого файла</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>Выберите файл с помощью файлового диалога</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="72"/> - <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="UI/DiffDialog.ui" line="52"/> + <location filename="UI/DiffDialog.ui" line="73"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="UI/DiffDialog.ui" line="53"/> <source>File &2:</source> <translation>Файл: &2:</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>Задайте имя второго файла</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>Генерировать универсальный вывод (Unified Diff)</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="90"/> + <location filename="UI/DiffDialog.ui" line="91"/> <source>&Unified Diff</source> <translation>&Unified Diff</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="93"/> + <location filename="UI/DiffDialog.ui" line="94"/> <source>Alt+U</source> <translation>Alt+U</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>Генерировать контекстный вывод (Context Diff)</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="106"/> + <location filename="UI/DiffDialog.ui" line="107"/> <source>Co&ntext Diff</source> <translation>Co&ntext Diff</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="109"/> + <location filename="UI/DiffDialog.ui" line="110"/> <source>Alt+N</source> <translation>Alt+N</translation> </message> @@ -15637,7 +15637,7 @@ <translation>Восстановление после прерванной транзакции</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>Обновить рабочий каталог?</translation> </message> @@ -15652,17 +15652,17 @@ <translation>Создать группу изменений</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>Применить группу изменений</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>Неправильная подкоманда ({0}) для Bisect.</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>Mercurial Bisect ({0})</translation> </message> @@ -15687,7 +15687,7 @@ <translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></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>Удаление файлов только из репозитория</translation> </message> @@ -15697,7 +15697,7 @@ <translation>Mercurial файлы изменений (*.hg)</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>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> @@ -15707,12 +15707,12 @@ <translation>Файлы изменений</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>Отмена изменений</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>Не задана ревизия. Отмена...</translation> </message> @@ -15722,12 +15722,12 @@ <translation><p>Файл группы изменений<b>{0}</b> уже существует. Переписать?</p></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> @@ -15737,17 +15737,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> @@ -16604,41 +16604,41 @@ <translation>Откуда:</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>Имя источника</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><b>Откуда</b> <p>Это поле показывает имя источника.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="60"/> <source>Enter the target name</source> <translation>Задайте имя приёмника</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="66"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> <source><b>Target name</b> <p>Enter the new name in this field.</p></source> <translation><b>Куда</b> <p>В этом поле задайте новое мия.</p></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>Куда:</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="80"/> + <source>Select to force the operation</source> + <translation>Выполнить операцию принудительно</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="83"/> - <source>Select to force the operation</source> - <translation>Выполнить операцию принудительно</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="86"/> <source>Enforce operation</source> <translation>Выполнить принудительно</translation> </message> @@ -16734,52 +16734,52 @@ <translation>Различие</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><b>Mercurial Diff (различие)</b><p>Отображает вывод команды hg diff.</p></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>Ошибки</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>Ввод</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="104"/> + <source>Press to send the input to the hg process</source> + <translation>Отправить данные процессу hg</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="107"/> - <source>Press to send the input to the hg process</source> - <translation>Отправить данные процессу hg</translation> + <source>&Send</source> + <translation>&Отправить</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="110"/> - <source>&Send</source> - <translation>&Отправить</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="113"/> <source>Alt+S</source> <translation>Alt+О</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>Задайте данные, которые будут посланы процессу hg</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="124"/> + <source>Select to switch the input field to password mode</source> + <translation>Задать режим ввода пароля для поля ввода пароля</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="127"/> - <source>Select to switch the input field to password mode</source> - <translation>Задать режим ввода пароля для поля ввода пароля</translation> + <source>&Password Mode</source> + <translation>&Парольный режим</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="130"/> - <source>&Password Mode</source> - <translation>&Парольный режим</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="133"/> <source>Alt+P</source> <translation>Alt+П</translation> </message> @@ -18720,7 +18720,7 @@ <translation>Создать файл коллекции изменений</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>Применить группу изменений</translation> </message> @@ -18960,7 +18960,7 @@ <translation>Загрузить</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>Необходимо перезагрузить проект. Сделать это?</translation> </message> @@ -20080,7 +20080,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>Mercurial Status</translation> </message> @@ -20162,102 +20162,102 @@ <translation>Зафиксировать изменения в репозитории...</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>Добавить в репозиторий</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>Отмена изменений</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>Подстроить размеры колонок</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> - <source>added</source> - <translation>добавлено</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> - <source>modified</source> - <translation>изменено</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> + <source>added</source> + <translation>добавлено</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="107"/> + <source>modified</source> + <translation>изменено</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="108"/> <source>removed</source> <translation>удалено</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> + <source>not tracked</source> + <translation>не отслеживается</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> - <source>not tracked</source> - <translation>не отслеживается</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> <source>normal</source> <translation>нормальный</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> - <source>ignored</source> - <translation>игнорировано</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <source>ignored</source> + <translation>игнорировано</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="110"/> <source>missing</source> <translation>отсутствует</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>Ошибка процесса генерации</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>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</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>Зафиксировать</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>Нет доступных/выбранных неотправленных изменений.</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>Добавить</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>Нет/не выбраны неверсионные элементы.</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>Откатить</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>Удалить из репозитория</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>Удалить</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>Нет/не выбраны пропущенных элементы.</translation> </message> @@ -20332,17 +20332,17 @@ <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> @@ -20352,15 +20352,25 @@ <translation type="obsolete">Различие</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> @@ -36073,73 +36083,73 @@ <translation>Выберите цель</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="13"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="14"/> <source>Subversion Copy</source> <translation>Копия Subversion</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>Нажмите, чтобы открыть диалог выбора</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><b>Каталог назначенияy</b> <p>Выберите имя каталога назначения с помощью диалога выбора.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="34"/> - <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="41"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="35"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="42"/> <source>Source:</source> <translation>Откуда:</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>Имя источника</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><b>Откуда</b> <p>Это поле показывает имя источника.</p></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>Задайте имя приёмника</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><b>Куда</b> <p>В этом поле задайте новое мия.</p></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>Куда:</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>Выполнить операцию принудительно</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>Выполнить принудительно</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><b>Назначение</b><p>Выберите имя назначения с помощью диалога выбора.</p></translation> @@ -36287,57 +36297,57 @@ <translation><p>Невозможно сохранить файл заплатки <b>{0}</b>:<br>Причина: {1}.</p></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>Различие</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><b>Subversion Diff (различие)</b><p>Отображает вывод команды svn diff.</p></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>Ошибки</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>Ввод</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>Отправить данные процессу subversion</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>&Отправить</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>Alt+S</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>Задайте данные, которые будут посланы процессу subversion</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>Задать режим ввода пароля для поля ввода пароля</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>&Парольный режим</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>Alt+P</translation> </message> @@ -38377,67 +38387,67 @@ <context> <name>SvnStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="159"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="163"/> <source>normal</source> <translation>Нормальный</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>Добавлено</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>Удалено</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="164"/> + <source>modified</source> + <translation>Изменено</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="165"/> + <source>conflict</source> + <translation>Конфликт</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="158"/> + <source>unversioned</source> + <translation>нет версий</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="159"/> + <source>missing</source> + <translation>Отсутствует</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="160"/> - <source>modified</source> - <translation>Изменено</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="161"/> - <source>conflict</source> - <translation>Конфликт</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> - <source>unversioned</source> - <translation>нет версий</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="155"/> - <source>missing</source> - <translation>Отсутствует</translation> + <source>type error</source> + <translation>ошибка типа</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="161"/> + <source>no</source> + <translation>нет</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="162"/> + <source>yes</source> + <translation>да</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="156"/> - <source>type error</source> - <translation>ошибка типа</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="157"/> - <source>no</source> - <translation>нет</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="158"/> - <source>yes</source> - <translation>да</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="152"/> <source>external</source> <translation>внешний</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="153"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="157"/> <source>ignored</source> <translation>игнорированный</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="279"/> <source>Subversion Status</source> <translation>Статус Subversion</translation> </message> @@ -38447,82 +38457,82 @@ <translation>Зафиксировать изменения в репозитории...</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>Зафиксировать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> - <source>There are no uncommitted changes available/selected.</source> - <translation>Нет доступных/выбранных неотправленных изменений.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <source>There are no uncommitted changes available/selected.</source> + <translation>Нет доступных/выбранных неотправленных изменений.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="702"/> <source>Lock</source> <translation>Захватить</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>Освободить</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>Нарушить захват</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="107"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="111"/> <source>Steal lock</source> <translation>Украсть захват</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="155"/> <source>locked</source> <translation>захвачено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="152"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="156"/> <source>other lock</source> <translation>другой захват</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="153"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="157"/> <source>stolen lock</source> <translation>захват украден</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="158"/> + <source>broken lock</source> + <translation>захват нарушен</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="154"/> - <source>broken lock</source> - <translation>захват нарушен</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="150"/> <source>not locked</source> <translation>не захвачено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> <source>replaced</source> <translation>заменено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="702"/> <source>There are no unlocked files available/selected.</source> <translation>Нет доступных/выбранных незахваченных файлов.</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>Нет доступных/выбранных захваченных файлов.</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>Нарушить захват</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>Украсть захват</translation> </message> @@ -38639,12 +38649,12 @@ <translation>Нажмите, чтобы обновить отображение статуса</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="111"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="115"/> <source>Adjust column sizes</source> <translation>Подстроить размеры колонок</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>Ошибка процесса генерации</translation> </message> @@ -38654,32 +38664,32 @@ <translation>Обновить</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>Добавить в репозиторий</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>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="605"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="605"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/> <source>There are no unversioned entries available/selected.</source> <translation>Нет/не выбраны неверсионные элементы.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="647"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> <source>Revert</source> <translation>Откатить</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>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -38689,22 +38699,22 @@ <translation>Список изменений</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>Добавить к списку изменений</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>Удалить из списка изменений</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>Среди выбранных нет файлов не включенных в список изменений.</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>Среди выбранных нет файлов включенных в список изменений.</translation> </message> @@ -38769,17 +38779,17 @@ <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> @@ -38789,20 +38799,30 @@ <translation type="obsolete">Различие</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>
diff -r 74fc87c7b7a8 -r d051b9d1426d i18n/eric5_tr.ts --- a/i18n/eric5_tr.ts Mon Sep 05 19:30:37 2011 +0200 +++ b/i18n/eric5_tr.ts Mon Sep 05 20:01:12 2011 +0200 @@ -5513,67 +5513,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>Dosya Farklılıkları</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="21"/> + <location filename="UI/DiffDialog.ui" line="22"/> <source>File &1:</source> <translation>Dosya &1:</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>İlk dosyanın adını giriniz</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>Dosya seçme diyaloğu ile bir dosya seç</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="72"/> - <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="UI/DiffDialog.ui" line="52"/> + <location filename="UI/DiffDialog.ui" line="73"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="UI/DiffDialog.ui" line="53"/> <source>File &2:</source> <translation>Dosya &2:</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>İkinci dosyanın adını giriniz</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>Birleşik farkları üretmek için sç</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="90"/> + <location filename="UI/DiffDialog.ui" line="91"/> <source>&Unified Diff</source> <translation>Birleşik farklar &U</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="93"/> + <location filename="UI/DiffDialog.ui" line="94"/> <source>Alt+U</source> <translation>Alt+U</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>İçerik farklarını üretmek için seç</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="106"/> + <location filename="UI/DiffDialog.ui" line="107"/> <source>Co&ntext Diff</source> <translation>İçerik farkları &n</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="109"/> + <location filename="UI/DiffDialog.ui" line="110"/> <source>Alt+N</source> <translation>Alt+N</translation> </message> @@ -15800,7 +15800,7 @@ <translation>Değişimgrubu öngörünümü</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>Mercurial Değişimgrubu Dosyaları (*.hg);;Tüm Dosyalar (*)</translation> </message> @@ -15810,37 +15810,37 @@ <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> @@ -15850,12 +15850,12 @@ <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> @@ -15865,17 +15865,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> @@ -16729,41 +16729,41 @@ <translation>Kaynak:</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>Kaynağın adını göster</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><b>Kaynak adı</b> <p>Bu alan kaynağın adını gösterir.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="60"/> <source>Enter the target name</source> <translation>Hedefin adını gir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="66"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> <source><b>Target name</b> <p>Enter the new name in this field.</p></source> <translation><b>Hedef İsim</b> <p>Bu alanın yeni adını giriniz.</p></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>Hedef:</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="80"/> + <source>Select to force the operation</source> + <translation>Zorunlu çalıştırlacakları seç</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="83"/> - <source>Select to force the operation</source> - <translation>Zorunlu çalıştırlacakları seç</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="86"/> <source>Enforce operation</source> <translation>Zorunlu çalışma</translation> </message> @@ -16859,52 +16859,52 @@ <translation>Farklılık</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><b>Mercurial Fark</b><p>Bu hg diff komutunun çıktısını gösterir.</p></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>Hatalar</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>Girdi</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="104"/> + <source>Press to send the input to the hg process</source> + <translation>Hg işlem girdilerini göndermek için basınız</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="107"/> - <source>Press to send the input to the hg process</source> - <translation>Hg işlem girdilerini göndermek için basınız</translation> + <source>&Send</source> + <translation>&Gönder</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="110"/> - <source>&Send</source> - <translation>&Gönder</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="113"/> <source>Alt+S</source> <translation>Alt+S</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>Hg işlemlerine göndermek için verileri giriniz</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="124"/> + <source>Select to switch the input field to password mode</source> + <translation>Giriş alanını parola moduna çevirmek için seçiniz</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="127"/> - <source>Select to switch the input field to password mode</source> - <translation>Giriş alanını parola moduna çevirmek için seçiniz</translation> + <source>&Password Mode</source> + <translation>&Parola Modu</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="130"/> - <source>&Password Mode</source> - <translation>&Parola Modu</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="133"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> @@ -18860,7 +18860,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> @@ -19015,7 +19015,7 @@ <translation>Çekmek</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>Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> @@ -20135,7 +20135,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>Mercurial Durumu</translation> </message> @@ -20217,102 +20217,102 @@ <translation>Yapılan değişiklekleri kaynak havuzuna teslim et...</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>Kaynak havuzuna ekle</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>Kaynak havuzundan kaldır</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>Değişiklikleri başa döndür</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>Sütün boyutunu ayarla</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> - <source>added</source> - <translation>eklendi</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> - <source>modified</source> - <translation>değiştirildi</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> + <source>added</source> + <translation>eklendi</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="107"/> + <source>modified</source> + <translation>değiştirildi</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="108"/> <source>removed</source> <translation>kaldırılmış</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> + <source>not tracked</source> + <translation>izlenmedi</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="110"/> + <source>missing</source> + <translation>kayıp</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> - <source>not tracked</source> - <translation>izlenmedi</translation> + <source>normal</source> + <translation>normal</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> - <source>missing</source> - <translation>kayıp</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> - <source>normal</source> - <translation>normal</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> <source>ignored</source> <translation>yoksayıldı</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>İşlem Üretecinde Hata</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>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</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>Teslimat</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>Ekle</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>Kaldır</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>Başa Dönme</translation> </message> @@ -20387,17 +20387,17 @@ <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> @@ -20407,15 +20407,25 @@ <translation type="obsolete">Farklılık</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> @@ -36190,73 +36200,73 @@ <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>Altsürüm Kopyası</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>Bir seçim diyaloğu açmak için basınız</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><b>Hedef Dizin</b> <p>Seçim diyaloğu yolu ile bu çalışma için bir hedef isim seçin.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="34"/> - <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="41"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="35"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="42"/> <source>Source:</source> <translation>Kaynak:</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>Kaynağın adını göster</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><b>Kaynak adı</b> <p>Bu alan kaynağın adını gösterir.</p></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>Hedefin adını gir</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><b>Hedef İsim</b> <p>Bu alanın yeni adını giriniz.</p></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>Hedef:</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>Zorunlu çalıştırlacakları seç</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>Zorunlu çalışma</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> @@ -36395,57 +36405,57 @@ <translation>Altsürüm farklılıkları</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>Farklılık</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><b>Altsürüml Fark</b><p>Bu svn diff komutunun çıktısını gösterir.</p></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>Hatalar</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>Girdi</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>Girdiyi altsürüm sürecine göndermek için basınız</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>&Gönder</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>Alt+S</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>Altsürüm işlemleri için gönderilecek verileri gir</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>Giriş alanını parola moduna çevirmek için seçiniz</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>&Parola Modu</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>Alt+P</translation> </message> @@ -38469,7 +38479,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>Altsürüm Durumu</translation> </message> @@ -38601,202 +38611,202 @@ <translation>Yapılan değişiklekleri kaynak havuzuna teslim et...</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>Kaynak havuzuna ekle</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>Değişiklikleri başa döndür</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>Değişiklik Listesine Ekle</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>DEğişiklik listesinden çıkar</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>Kilitli</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>Kilitsiz</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>Kırma Kilidi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="107"/> - <source>Steal lock</source> - <translation>Hırsızlık kilidi</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="111"/> + <source>Steal lock</source> + <translation>Hırsızlık kilidi</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="115"/> <source>Adjust column sizes</source> <translation>Sütün boyutunu ayarla</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>eklendi</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>silinmiş</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>değiştirildi</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="158"/> + <source>unversioned</source> + <translation>sürüm numarası verilmemiş</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="155"/> + <source>locked</source> + <translation>kilitlendi</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="156"/> + <source>other lock</source> + <translation>diğer kilitler</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="157"/> + <source>stolen lock</source> + <translation>hırsız kilidi</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="158"/> + <source>broken lock</source> + <translation>kırma kilidi</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="154"/> + <source>not locked</source> + <translation>kilitlenmedi</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="163"/> + <source>normal</source> + <translation>normal</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> - <source>unversioned</source> - <translation>sürüm numarası verilmemiş</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="151"/> - <source>locked</source> - <translation>kilitlendi</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="152"/> - <source>other lock</source> - <translation>diğer kilitler</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="153"/> - <source>stolen lock</source> - <translation>hırsız kilidi</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="154"/> - <source>broken lock</source> - <translation>kırma kilidi</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="150"/> - <source>not locked</source> - <translation>kilitlenmedi</translation> + <source>replaced</source> + <translation>değiştirildi</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="165"/> + <source>conflict</source> + <translation>çelişki</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="156"/> + <source>external</source> + <translation>harici</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="157"/> + <source>ignored</source> + <translation>yoksayıldı</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="159"/> - <source>normal</source> - <translation>normal</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="150"/> - <source>replaced</source> - <translation>değiştirildi</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="161"/> - <source>conflict</source> - <translation>çelişki</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="152"/> - <source>external</source> - <translation>harici</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="153"/> - <source>ignored</source> - <translation>yoksayıldı</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="155"/> <source>missing</source> <translation>kayıp</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>tip hatası</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>no</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>evet</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>İşlem Üretecinde Hata</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>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</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>Teslimat</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>Ekle</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>Başa Dönme</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>Ekle</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>Başa Dönme</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>Kırma Kilidi</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>Hırsızlık Kilidi</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> @@ -38861,17 +38871,17 @@ <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> @@ -38881,20 +38891,30 @@ <translation type="obsolete">Farklılık</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>
diff -r 74fc87c7b7a8 -r d051b9d1426d i18n/eric5_zh_CN.GB2312.ts --- a/i18n/eric5_zh_CN.GB2312.ts Mon Sep 05 19:30:37 2011 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Mon Sep 05 20:01:12 2011 +0200 @@ -5899,67 +5899,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>文件差异</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="21"/> + <location filename="UI/DiffDialog.ui" line="22"/> <source>File &1:</source> <translation>文件 &1:</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>输入第一个文件的名称</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>请通过文件选择对话框选择文件</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="72"/> + <location filename="UI/DiffDialog.ui" line="73"/> <source>...</source> <translation>……</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="52"/> + <location filename="UI/DiffDialog.ui" line="53"/> <source>File &2:</source> <translation>文件 &2:</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>输入第二个文件的名称</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>选择产生统一差异</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="90"/> + <location filename="UI/DiffDialog.ui" line="91"/> <source>&Unified Diff</source> <translation>统一(&U)差异</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="93"/> + <location filename="UI/DiffDialog.ui" line="94"/> <source>Alt+U</source> <translation>Alt+U</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>选择产生上下文差异</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="106"/> + <location filename="UI/DiffDialog.ui" line="107"/> <source>Co&ntext Diff</source> <translation>上下文(&n)差异</translation> </message> <message> - <location filename="UI/DiffDialog.ui" line="109"/> + <location filename="UI/DiffDialog.ui" line="110"/> <source>Alt+N</source> <translation>Alt+N</translation> </message> @@ -16877,7 +16877,7 @@ <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> @@ -16892,17 +16892,17 @@ <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="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> @@ -16927,7 +16927,7 @@ <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> @@ -16937,7 +16937,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> @@ -16947,12 +16947,12 @@ <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> @@ -16962,12 +16962,12 @@ <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> @@ -16977,17 +16977,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> @@ -17831,41 +17831,41 @@ <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"><b>源名称</b> <p>该区域显示源名称。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> + <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="66"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> <source><b>Target name</b> <p>Enter the new name in this field.</p></source> <translation type="unfinished"><b>目标名</b> <p>在该区域输入新名称。</p></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> @@ -17961,52 +17961,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> - <translation type="unfinished"></translation> + <source>&Send</source> + <translation type="unfinished">发送(&S)</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="110"/> - <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="113"/> <source>Alt+S</source> <translation type="unfinished">Alt+S</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> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <source>&Password Mode</source> + <translation type="unfinished">密码模式(&P)</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="130"/> - <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="133"/> <source>Alt+P</source> <translation type="unfinished">Alt+P</translation> </message> @@ -19917,7 +19917,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> @@ -20147,7 +20147,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> @@ -21267,7 +21267,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> @@ -21348,102 +21348,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="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="105"/> - <source>not tracked</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="106"/> + <source>ignored</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="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="625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> <source>Revert</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="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> @@ -21518,17 +21518,17 @@ <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> @@ -21538,15 +21538,25 @@ <translation type="obsolete">差异</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> @@ -39272,73 +39282,73 @@ <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>版本控制副本</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>点击打开选择对话框</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><b>目标文件夹</b> <p>通过选择对话框为操作选择目标名称。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="34"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="35"/> <source>...</source> <translation>……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="41"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="42"/> <source>Source:</source> <translation>源:</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>显示源名称</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><b>源名称</b> <p>该区域显示源名称。</p></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>输入目标名</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><b>目标名</b> <p>在该区域输入新名称。</p></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>目标:</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>选择强制操作</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>强制操作</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><b>目标名</b> @@ -39500,57 +39510,57 @@ <translation>版本控制差异</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>差异</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><b>版本控制差异</b><p>显示版本控制差异命令的输出。</p></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>错误</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>输入</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>点击将输入发送到版本控制进程</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>发送(&S)</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>Alt+S</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>输入要发送到版本控制进程的数据</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>选择将输入区域转换成密码模式</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>密码模式(&P)</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>Alt+P</translation> </message> @@ -41757,7 +41767,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>版本控制状态</translation> </message> @@ -41889,142 +41899,142 @@ <translation>将更改提交到储存库中……</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>添加到储存库</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>还原改变</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>添加更改列表</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>从更改列表中移除</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>闭锁</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>解锁</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>Break lock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="107"/> - <source>Steal lock</source> - <translation>Steal lock</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="111"/> + <source>Steal lock</source> + <translation>Steal lock</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="115"/> <source>Adjust column sizes</source> <translation>调整列宽</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>已添加</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>已删除</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>已修改</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="158"/> + <source>unversioned</source> + <translation>unversioned</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="155"/> + <source>locked</source> + <translation>已闭锁</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="156"/> + <source>other lock</source> + <translation>其它闭锁</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="157"/> + <source>stolen lock</source> + <translation>stolen 闭锁</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="158"/> + <source>broken lock</source> + <translation>broken 闭锁</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="154"/> + <source>not locked</source> + <translation>未闭锁</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="163"/> + <source>normal</source> + <translation>标准</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> - <source>unversioned</source> - <translation>unversioned</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="151"/> - <source>locked</source> - <translation>已闭锁</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="152"/> - <source>other lock</source> - <translation>其它闭锁</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="153"/> - <source>stolen lock</source> - <translation>stolen 闭锁</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="154"/> - <source>broken lock</source> - <translation>broken 闭锁</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="150"/> - <source>not locked</source> - <translation>未闭锁</translation> + <source>replaced</source> + <translation>已替换</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="165"/> + <source>conflict</source> + <translation>冲突</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="156"/> + <source>external</source> + <translation>外部</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="157"/> + <source>ignored</source> + <translation>已忽略</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="159"/> - <source>normal</source> - <translation>标准</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="150"/> - <source>replaced</source> - <translation>已替换</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="161"/> - <source>conflict</source> - <translation>冲突</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="152"/> - <source>external</source> - <translation>外部</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="153"/> - <source>ignored</source> - <translation>已忽略</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="155"/> <source>missing</source> <translation>遗漏</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>类型错误</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>否</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>是</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>进程生成错误</translation> </message> @@ -42034,62 +42044,62 @@ <translation type="obsolete">无法启动进程 %1,在搜索路径中。</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>提交</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> - <source>There are no uncommitted changes available/selected.</source> - <translation>没有未提交的更改可用或被选择。</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="605"/> - <source>Add</source> - <translation>添加</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="605"/> - <source>There are no unversioned entries available/selected.</source> - <translation>没有未版本化的条目可用或被选择。</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="647"/> - <source>Revert</source> - <translation>还原</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <source>There are no uncommitted changes available/selected.</source> + <translation>没有未提交的更改可用或被选择。</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/> + <source>Add</source> + <translation>添加</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/> + <source>There are no unversioned entries available/selected.</source> + <translation>没有未版本化的条目可用或被选择。</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> + <source>Revert</source> + <translation>还原</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="702"/> <source>There are no unlocked files available/selected.</source> <translation>没有未解锁的文件可用或被选择。</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>没有闭锁的文件可用或被选择。</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>Break Lock</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>Steal Lock</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>没有不属于更改列表的文件可用或被选择。</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>没有属于更改列表的文件可用或被选择。</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> @@ -42154,17 +42164,17 @@ <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> @@ -42174,20 +42184,30 @@ <translation type="obsolete">差异</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>