Mercurial Repositories > eric / changeset
changeset
Extended the code logic for the switch command of the various version control interfaces.
Mon, 30 May 2011 19:23:59 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 30 May 2011 19:23:59 +0200
- changeset 1083
- dc680a0ce221
- parent 1082
- 8387830c1089
- child 1085
- ef6102d5fefe
Extended the code logic for the switch command of the various version control interfaces.
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Mon May 30 19:21:18 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Mon May 30 19:23:59 2011 +0200 @@ -1254,6 +1254,12 @@ <dd> directory name to be switched (string) </dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating, that the switch contained an add + or delete (boolean) +</dd> </dl><a NAME="Hg.vcsTag" ID="Hg.vcsTag"></a> <h4>Hg.vcsTag</h4> <b>vcsTag</b>(<i>name</i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html Mon May 30 19:21:18 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html Mon May 30 19:23:59 2011 +0200 @@ -1017,6 +1017,12 @@ <dd> directory name to be switched (string) </dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating, that the switch contained an add + or delete (boolean) +</dd> </dl><a NAME="Subversion.vcsTag" ID="Subversion.vcsTag"></a> <h4>Subversion.vcsTag</h4> <b>vcsTag</b>(<i>name</i>)
--- a/Documentation/Source/eric5.VCS.VersionControl.html Mon May 30 19:21:18 2011 +0200 +++ b/Documentation/Source/eric5.VCS.VersionControl.html Mon May 30 19:23:59 2011 +0200 @@ -1086,6 +1086,12 @@ directory name to be switched (string) </dd> </dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating, that the switch contained an add + or delete (boolean) +</dd> +</dl><dl> <dt>Raises <b>RuntimeError</b>:</dt> <dd> not implemented
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Mon May 30 19:21:18 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Mon May 30 19:23:59 2011 +0200 @@ -827,6 +827,8 @@ Public method used to switch a working directory to a different revision. @param name directory name to be switched (string) + @return flag indicating, that the switch contained an add + or delete (boolean) """ dname, fname = self.splitPath(name) @@ -835,7 +837,7 @@ while not os.path.isdir(os.path.join(repodir, self.adminDir)): repodir = os.path.dirname(repodir) if repodir == os.sep: - return + return False if self.isExtensionActive("bookmarks"): bookmarksList = \ @@ -847,7 +849,9 @@ bookmarksList) if dlg.exec_() == QDialog.Accepted: rev = dlg.getRevision() - self.vcsUpdate(name, revision=rev) + return self.vcsUpdate(name, revision=rev) + + return False def vcsRegisteredState(self, name): """
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py Mon May 30 19:21:18 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py Mon May 30 19:23:59 2011 +0200 @@ -83,6 +83,8 @@ .format(self.trUtf8(svnNotifyActionMap[eventDict["action"]]), eventDict["path"], mime) + if '.e4p' in eventDict["path"]: + self.__hasAddOrDelete = True if eventDict["action"] in \ [pysvn.wc_notify_action.add, pysvn.wc_notify_action.commit_added, pysvn.wc_notify_action.commit_deleted, pysvn.wc_notify_action.delete,
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py Mon May 30 19:21:18 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py Mon May 30 19:23:59 2011 +0200 @@ -1029,6 +1029,8 @@ Public method used to switch a directory to a different tag/branch. @param name directory name to be switched (string) + @return flag indicating, that the switch contained an add + or delete (boolean) """ dname, fname = self.splitPath(name) @@ -1039,7 +1041,7 @@ self.trUtf8("""The URL of the project repository could not be""" """ retrieved from the working copy. The switch operation will""" """ be aborted""")) - return + return False if self.otherData["standardLayout"]: url = None @@ -1053,7 +1055,7 @@ self.allTagsBranchesList.remove(tag) self.allTagsBranchesList.insert(0, tag) else: - return + return False if self.otherData["standardLayout"]: rx_base = QRegExp('(.+)/(trunk|tags|branches).*') @@ -1063,7 +1065,7 @@ self.trUtf8("""The URL of the project repository has an""" """ invalid format. The switch operation will""" """ be aborted""")) - return + return False reposRoot = rx_base.cap(1) tn = tag @@ -1093,6 +1095,9 @@ locker.unlock() dlg.finish() dlg.exec_() + res = dlg.hasAddOrDelete() + self.checkVCSStatus() + return res def vcsMerge(self, name): """
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py Mon May 30 19:21:18 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py Mon May 30 19:23:59 2011 +0200 @@ -164,6 +164,9 @@ if not self.__hasAddOrDelete and len(s) > 0: # check the output for l in s.split(os.linesep): + if '.e4p' in l: + self.__hasAddOrDelete = True + break if l and l[0].strip() in ['A', 'D']: self.__hasAddOrDelete = True break
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py Mon May 30 19:21:18 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py Mon May 30 19:23:59 2011 +0200 @@ -911,7 +911,7 @@ self.trUtf8("""The URL of the project repository could not be""" """ retrieved from the working copy. The switch operation will""" """ be aborted""")) - return + return False if self.otherData["standardLayout"]: url = None @@ -925,7 +925,7 @@ self.allTagsBranchesList.remove(tag) self.allTagsBranchesList.insert(0, tag) else: - return + return False if self.otherData["standardLayout"]: rx_base = QRegExp('(.+)/(trunk|tags|branches).*') @@ -935,7 +935,7 @@ self.trUtf8("""The URL of the project repository has an""" """ invalid format. The switch operation will""" """ be aborted""")) - return + return False reposRoot = rx_base.cap(1) tn = tag @@ -963,6 +963,9 @@ res = dia.startProcess(args) if res: dia.exec_() + res = dia.hasAddOrDelete() + self.checkVCSStatus() + return res def vcsMerge(self, name): """
--- a/VCS/ProjectHelper.py Mon May 30 19:21:18 2011 +0200 +++ b/VCS/ProjectHelper.py Mon May 30 19:23:59 2011 +0200 @@ -430,7 +430,14 @@ """ Protected slot used to switch the local project to another tag/branch. """ - self.vcs.vcsSwitch(self.project.ppath) + shouldReopen = self.vcs.vcsSwitch(self.project.ppath) + if shouldReopen: + res = E5MessageBox.yesNo(self.parent(), + self.trUtf8("Switch"), + self.trUtf8("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() def _vcsMerge(self): """
--- a/VCS/VersionControl.py Mon May 30 19:21:18 2011 +0200 +++ b/VCS/VersionControl.py Mon May 30 19:23:59 2011 +0200 @@ -309,6 +309,8 @@ It must not return anything. @param name directory name to be switched (string) + @return flag indicating, that the switch contained an add + or delete (boolean) @exception RuntimeError not implemented """ raise RuntimeError('Not implemented')
--- a/i18n/eric5_cs.ts Mon May 30 19:21:18 2011 +0200 +++ b/i18n/eric5_cs.ts Mon May 30 19:23:59 2011 +0200 @@ -15552,132 +15552,132 @@ <translation>Merging</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1043"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source>Mercurial Log</source> <translation>Mercurial log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source>Select number of entries to show.</source> <translation>Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> <source>Pulling from a remote Mercurial repository</source> <translation>Stažení (pull) z Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1501"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1505"/> <source>Pushing to a remote Mercurial repository</source> <translation>Odeslání (push) do Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1619"/> <source>Resolving files/directories</source> <translation>Vyřešení souborů/složek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <source>Create Branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <source>Enter branch name</source> <translation>Zadejte název větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1648"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1652"/> <source>Creating branch in the Mercurial repository</source> <translation>Vytvoření větve v Mercurial repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Ověřit integritu Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1755"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Showing aliases for remote repositories</source> <translation>Zobrazení aliasů pro vzdálené úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1797"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2023"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027"/> <source>Shall the working directory be updated?</source> <translation>Má být pracovní adresář aktualizován?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1820"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2118"/> <source>Removing files from the Mercurial repository only</source> <translation>Odebrat soubory jen z Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -15687,37 +15687,37 @@ <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="2017"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2021"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <source>No revision given. Aborting...</source> <translation>Nebyla dána žádná revize. Ruším...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -34851,7 +34851,7 @@ <translation>Odebrat soubory/adresáře ze Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> <source>Subversion Error</source> <translation>Subversion chyba</translation> </message> @@ -34871,87 +34871,87 @@ <translation>Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1037"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1039"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>Z pracovní kopie nelze získat URL repozitáře projektu. Operace přepínání bude zrušena</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>URL repozitáře projektu má neplatný formát. Operace přepínání bude zrušena</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1338"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1343"/> <source>Subversion command</source> <translation>Subversion příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1445"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1450"/> <source>Resolving conficts</source> <translation>Řešení konfliktů</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1551"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1556"/> <source>Subversion Set Property</source> <translation>Nastavit Subversion vlastnost</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/> <source>You have to supply a property name. Aborting.</source> <translation>Musíte doplnit jméno vlastnosti. Zrušeno.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1602"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1607"/> <source>Subversion Delete Property</source> <translation>Smazat Subversion vlastnost</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1424"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1427"/> <source>Enter property name</source> <translation>Zadejte jméno vlastnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> <source>Subversion Log</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> <source>Select number of entries to show.</source> <translation>Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1786"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1791"/> <source>Locking in the Subversion repository</source> <translation>Zamknout v Subversion repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1829"/> <source>Unlocking in the Subversion repository</source> <translation>Odemknout v Subversion repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1567"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1572"/> <source>Property set.</source> <translation>Vlastnost nastavena.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1617"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1622"/> <source>Property deleted.</source> <translation>Vlastnost smazána.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> <source>Subversion Lock</source> <translation>Subversion zámek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> <source>Enter lock comment</source> <translation>Zadejte komentář zámku</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1869"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1874"/> <source>Relocating</source> <translation></translation> </message> @@ -35116,27 +35116,27 @@ <translation>Nelze spustit svn proces.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1895"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> <source>Repository Browser</source> <translation>Prohlížeč repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1895"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> <source>Enter the repository URL.</source> <translation>Zadejte URL repozitáře.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1919"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1924"/> <source>Remove from changelist</source> <translation>Odebrat ze seznamu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1955"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1960"/> <source>Add to changelist</source> <translation>Přidat do seznamu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1945"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1950"/> <source>Enter name of the changelist:</source> <translation>Zadejte název seznamu změn:</translation> </message> @@ -35171,22 +35171,22 @@ <translation>Tagování {0} v Subversion repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1083"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1085"/> <source>Switching to {0}</source> <translation>Přepínání do {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1182"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1187"/> <source>Merging {0}</source> <translation>Sloučení {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1302"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1307"/> <source>Cleaning up {0}</source> <translation>Vyčištění {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1489"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> @@ -35202,7 +35202,7 @@ <translation>Zapsaná revize {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1090"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1092"/> <source>Revision {0}. </source> <translation>Revize {0}.</translation> @@ -36005,12 +36005,12 @@ <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="553"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> <source>Author</source> <translation>Autor</translation> </message> @@ -45199,7 +45199,7 @@ <translation>Obnovit</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="353"/> + <location filename="VCS/ProjectHelper.py" line="435"/> <source>The project should be reread. Do this now?</source> <translation>Projekt bude znovu načten. Má se provést?</translation> </message> @@ -45218,6 +45218,11 @@ <source>The project retrieved from the repository does not contain an eric project file (*.e4p). Create it?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="VCS/ProjectHelper.py" line="435"/> + <source>Switch</source> + <translation type="unfinished">Přepnout</translation> + </message> </context> <context> <name>VcsPySvnPlugin</name> @@ -45289,17 +45294,17 @@ <context> <name>VersionControl</name> <message> - <location filename="VCS/VersionControl.py" line="534"/> + <location filename="VCS/VersionControl.py" line="536"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="660"/> + <location filename="VCS/VersionControl.py" line="662"/> <source>Repository status checking is switched off</source> <translation>Kontrolování stavu v repozitáři je vypnuto</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="534"/> + <location filename="VCS/VersionControl.py" line="536"/> <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> @@ -48528,30 +48533,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1092"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Rodič #{0}</b></td><td></td></tr><tr><td><b>Množina změn</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Větve</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48562,23 +48567,23 @@ <translation><h3>Informace o repozitáře</h3><p><table><tr><td><b>Mercurial V.</b></td><td>{0}</td></tr><tr></tr><tr><td><b>URL</b></td><td>{1}</td></tr></table></p>{2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1558"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Množina změn</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Rodiče</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -48586,7 +48591,7 @@ <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -48830,17 +48835,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1379"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1384"/> <source>unknown</source> <translation>neznámý</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1253"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Informace z repozitáře</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Aktuální revize</b></td><td>{2}</td></tr><tr><td><b>Revize zápisu změn</b></td><td>{3}</td></tr><tr><td><b>Datum zápisu změn</b></td><td>{4}</td></tr><tr><td><b>Čas zápisu změn</b></td><td>{5}</td></tr><tr><td><b>Poslední autor</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1385"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Informace z repozitáře</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Aktuální revize</b></td><td>{4}</td></tr><tr><td><b>Revize zápisu změn</b></td><td>{5}</td></tr><tr><td><b>Datum zápisu změn</b></td><td>{6}</td></tr><tr><td><b>Čas zápisu změn</b></td><td>{7}</td></tr><tr><td><b>Poslední autor</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_de.ts Mon May 30 19:21:18 2011 +0200 +++ b/i18n/eric5_de.ts Mon May 30 19:23:59 2011 +0200 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> +<!DOCTYPE TS> +<TS version="2.0" language="de"> <context> <name>AboutDialog</name> <message> @@ -1640,8 +1641,8 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="140"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open in New &Tab Ctrl+LMB</source> + <translation>In neuem &Register öffnen Strg+LMK</translation> </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="146"/> @@ -1859,7 +1860,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="73"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <source>Open in New &Tab Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -12499,7 +12500,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="799"/> - <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <source>Open Link in New Tab Ctrl+LMB</source> <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation> </message> <message> @@ -15291,167 +15292,167 @@ <translation>Zusammenführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1043"/> <source>Mercurial command</source> <translation>Mercurial Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source>Select number of entries to show.</source> <translation>Wähle Anzahl der anzuzeigenden Einträge.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> <source>Pulling from a remote Mercurial repository</source> <translation>Pull von einem entfernten Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1501"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1505"/> <source>Pushing to a remote Mercurial repository</source> <translation>Push in ein entferntes Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1619"/> <source>Resolving files/directories</source> <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <source>Enter branch name</source> <translation>Gib den Zweignamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1648"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1652"/> <source>Creating branch in the Mercurial repository</source> <translation>Erzeuge Zweig im Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verifiziere die Integrität des Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1755"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Showing aliases for remote repositories</source> <translation>Zeige Namen für entfernte Repositories</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1797"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2023"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027"/> <source>Shall the working directory be updated?</source> <translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1820"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> <source>Create .hgignore file</source> <translation>.hgignore Datei erstellen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2118"/> <source>Removing files from the Mercurial repository only</source> <translation>Lösche Dateien nur aus dem Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2017"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2021"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> <source>Identifying changegroup file</source> <translation>Identifiziere Änderungsgruppendatei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Mercurial Änderungsgruppendatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> @@ -34270,7 +34271,7 @@ <translation>Expotiere das Projekt aus dem Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> <source>Subversion Error</source> <translation>Subversion Fehler</translation> </message> @@ -34290,37 +34291,37 @@ <translation>Markiere {0} im Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1037"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1039"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>Die URL des Projektrepositories konnte nicht aus der Arbeitskopie ermittelt werden. Die Umschaltoperation wird abgebrochen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>Die URL des Projektrepositories hat ein ungültiges Format. Die Umschaltoperation wird abgebrochen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1083"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1085"/> <source>Switching to {0}</source> <translation>Schalte {0} um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1182"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1187"/> <source>Merging {0}</source> <translation>Arbeite Änderungen in {0} ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1302"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1307"/> <source>Cleaning up {0}</source> <translation>Räume {0} auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1338"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1343"/> <source>Subversion command</source> <translation>Subversion Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1489"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> @@ -34340,22 +34341,22 @@ <translation>Subversion Export</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1551"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1556"/> <source>Subversion Set Property</source> <translation>Subversion Eigenschaft definieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/> <source>You have to supply a property name. Aborting.</source> <translation>Sie müssen einen Namen für die Eigenschaft angeben. Abbruch.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1602"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1607"/> <source>Subversion Delete Property</source> <translation>Subversion Eigenschaft löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1424"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1427"/> <source>Enter property name</source> <translation>Gib den Namen der Eigenschaft ein</translation> </message> @@ -34390,7 +34391,7 @@ <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1445"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1450"/> <source>Resolving conficts</source> <translation>Löse Konflikte</translation> </message> @@ -34415,22 +34416,22 @@ <translation>Das Projekt konnte nicht aus dem Repository geladen werden.<br />Stelle das Original wieder her.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> <source>Subversion Log</source> <translation>Subversion Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> <source>Select number of entries to show.</source> <translation>Wähle Anzahl der anzuzeigenden Einträge.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1786"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1791"/> <source>Locking in the Subversion repository</source> <translation>Sperren im Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1829"/> <source>Unlocking in the Subversion repository</source> <translation>Entsperren im Subversion Repository</translation> </message> @@ -34440,34 +34441,34 @@ <translation>Revision {0} eingepflegt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1090"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1092"/> <source>Revision {0}. </source> <translation>Revision {0}. </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1567"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1572"/> <source>Property set.</source> <translation>Eigenschaft definiert.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1617"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1622"/> <source>Property deleted.</source> <translation>Eigenschaft gelöscht.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> <source>Subversion Lock</source> <translation>Subversion Sperre</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> <source>Enter lock comment</source> <translation>Gib eine Kommentar für die Sperre ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1869"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1874"/> <source>Relocating</source> <translation>Relozierung</translation> </message> @@ -34644,27 +34645,27 @@ <translation>Das svn Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1895"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> <source>Repository Browser</source> <translation>Repository Browser</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1895"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> <source>Enter the repository URL.</source> <translation>Gib die URL des Repository ein.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1919"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1924"/> <source>Remove from changelist</source> <translation>Von Änderungsliste entfernen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1955"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1960"/> <source>Add to changelist</source> <translation>Zu Änderungsliste hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1945"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1950"/> <source>Enter name of the changelist:</source> <translation>Gib deb Namen der Änderungsliste ein:</translation> </message> @@ -35483,12 +35484,12 @@ <translation>Subversion Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="553"/> <source>Revision</source> <translation>Revision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> <source>Author</source> <translation>Autor</translation> </message> @@ -44658,7 +44659,7 @@ <translation>Aktualisieren</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="353"/> + <location filename="VCS/ProjectHelper.py" line="435"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> @@ -44667,6 +44668,11 @@ <source>The project retrieved from the repository does not contain an eric project file (*.e4p). Create it?</source> <translation>Das aus dem Repository geladene Projekt enthält keine eric Projektdatei (*.e4p). Soll sie erzeugt werden?</translation> </message> + <message> + <location filename="VCS/ProjectHelper.py" line="435"/> + <source>Switch</source> + <translation>Umschalten</translation> + </message> </context> <context> <name>VcsPySvnPlugin</name> @@ -44738,17 +44744,17 @@ <context> <name>VersionControl</name> <message> - <location filename="VCS/VersionControl.py" line="534"/> + <location filename="VCS/VersionControl.py" line="536"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="534"/> + <location filename="VCS/VersionControl.py" line="536"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="660"/> + <location filename="VCS/VersionControl.py" line="662"/> <source>Repository status checking is switched off</source> <translation>Repository Statusüberprüfung ist ausgeschaltet</translation> </message> @@ -47878,24 +47884,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1092"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Vorgänger #{0}</b></td><td></td></tr> <tr><td><b>Änderungssatz</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marken</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Zweige</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -47904,7 +47910,7 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -47921,24 +47927,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1558"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Spitze</b></td><td></td></tr> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Änderungssatz</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Vorgänger</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -47949,7 +47955,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation> </message> @@ -48193,17 +48199,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1253"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Repository Informationen</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Aktuelle Revision</b></td><td>{2}</td></tr><tr><td><b>Eingepflegte Revision</b></td><td>{3}</td></tr><tr><td><b>Einpflegedatum</b></td><td>{4}</td></tr><tr><td><b>Einpflegezeit</b></td><td>{5}</td></tr><tr><td><b>Letzter Autor</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1379"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1384"/> <source>unknown</source> <translation>Unbekannt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1385"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Repository Informationen</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Aktuelle Revision</b></td><td>{4}</td></tr><tr><td><b>Eingepflegte Revision</b></td><td>{5}</td></tr><tr><td><b>Einpflegedatum</b></td><td>{6}</td></tr><tr><td><b>Einpflegezeit</b></td><td>{7}</td></tr><tr><td><b>Letzter Autor</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_en.ts Mon May 30 19:21:18 2011 +0200 +++ b/i18n/eric5_en.ts Mon May 30 19:23:59 2011 +0200 @@ -15210,167 +15210,167 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1043"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source>Select number of entries to show.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1501"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1505"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1619"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1648"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1652"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1755"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1797"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1820"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2017"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2021"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2023"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2118"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -34057,7 +34057,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> <source>Subversion Error</source> <translation type="unfinished"></translation> </message> @@ -34082,112 +34082,112 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1037"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1039"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1083"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1085"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1182"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1187"/> <source>Merging {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1302"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1307"/> <source>Cleaning up {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1338"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1343"/> <source>Subversion command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1445"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1450"/> <source>Resolving conficts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1489"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1551"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1556"/> <source>Subversion Set Property</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/> <source>You have to supply a property name. Aborting.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1602"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1607"/> <source>Subversion Delete Property</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1424"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1427"/> <source>Enter property name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> <source>Subversion Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> <source>Select number of entries to show.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1786"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1791"/> <source>Locking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1829"/> <source>Unlocking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1869"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1874"/> <source>Relocating</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1895"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> <source>Repository Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1895"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> <source>Enter the repository URL.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1919"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1924"/> <source>Remove from changelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1955"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1960"/> <source>Add to changelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1945"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1950"/> <source>Enter name of the changelist:</source> <translation type="unfinished"></translation> </message> @@ -34203,28 +34203,28 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1090"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1092"/> <source>Revision {0}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1567"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1572"/> <source>Property set.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1617"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1622"/> <source>Property deleted.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> <source>Subversion Lock</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> <source>Enter lock comment</source> <translation type="unfinished"></translation> </message> @@ -35203,12 +35203,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="553"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> <source>Author</source> <translation type="unfinished"></translation> </message> @@ -44264,7 +44264,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="353"/> + <location filename="VCS/ProjectHelper.py" line="435"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -44278,6 +44278,11 @@ <source>Dou you really want to remove this project from the repository (and disk)?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="VCS/ProjectHelper.py" line="435"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VcsPySvnPlugin</name> @@ -44349,17 +44354,17 @@ <context> <name>VersionControl</name> <message> - <location filename="VCS/VersionControl.py" line="534"/> + <location filename="VCS/VersionControl.py" line="536"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/VersionControl.py" line="534"/> + <location filename="VCS/VersionControl.py" line="536"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/VersionControl.py" line="660"/> + <location filename="VCS/VersionControl.py" line="662"/> <source>Repository status checking is switched off</source> <translation type="unfinished"></translation> </message> @@ -47486,30 +47491,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1092"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -47520,23 +47525,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1558"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -47544,7 +47549,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -47788,17 +47793,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1253"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1379"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1384"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1385"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Mon May 30 19:21:18 2011 +0200 +++ b/i18n/eric5_es.ts Mon May 30 19:23:59 2011 +0200 @@ -15346,32 +15346,32 @@ <translation>Haciendo un merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source>Mercurial Log</source> <translation>Registro de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source>Select number of entries to show.</source> <translation>Seleccionar número de entradas a mostrar.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> <source>Pulling from a remote Mercurial repository</source> <translation>Haciendo pull de un repositorio remoto Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1501"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1505"/> <source>Pushing to a remote Mercurial repository</source> <translation>Haciendo push a un repositorio remoto Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1619"/> <source>Resolving files/directories</source> <translation>Resolviendo archivos/directorios</translation> </message> @@ -15386,137 +15386,137 @@ <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1043"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <source>Enter branch name</source> <translation>Introducir nombre de branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1648"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1652"/> <source>Creating branch in the Mercurial repository</source> <translation>Creando branch en el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verificando la integridad del repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1755"/> <source>Showing the combined configuration settings</source> <translation>Mostrando los ajustes de configuración combinados</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1797"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2023"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027"/> <source>Shall the working directory be updated?</source> <translation>¿Debe ser actualizado el directorio de trabajo?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1820"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2118"/> <source>Removing files from the Mercurial repository only</source> <translation>Eliminando archivos unicamente del repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2017"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2021"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> <source>Identifying changegroup file</source> <translation>Identificando archivo de changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <source>No revision given. Aborting...</source> <translation>No se ha proporcionado revisión. Abortando...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo changegroup de Mercurial <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> <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> @@ -34437,7 +34437,7 @@ <translation>Eliminando archivos/directorios del repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> <source>Subversion Error</source> <translation>Error de Subversion</translation> </message> @@ -34457,97 +34457,97 @@ <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1037"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1039"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>La URL del repositorio del proyecto no ha podido recuperarse de la copia de trabajo. La operación switch se abortará</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>La URL del repositorio del proyecto tiene un formato no válido. La operación switch se abortará</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1338"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1343"/> <source>Subversion command</source> <translation>Comando de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1445"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1450"/> <source>Resolving conficts</source> <translation>Resolviendo conflictos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1551"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1556"/> <source>Subversion Set Property</source> <translation>Asignar Propiedad de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/> <source>You have to supply a property name. Aborting.</source> <translation>Tiene que proporcionar un nombre de propiedad. Abortando.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1602"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1607"/> <source>Subversion Delete Property</source> <translation>Borrar Propiedad de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1424"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1427"/> <source>Enter property name</source> <translation>Introducir nombre de la propiedad</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> <source>Subversion Log</source> <translation>Log de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> <source>Select number of entries to show.</source> <translation>Seleccionar número de entradas a mostrar.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1786"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1791"/> <source>Locking in the Subversion repository</source> <translation>Bloqueando en el repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1829"/> <source>Unlocking in the Subversion repository</source> <translation>Desbloqueando en el repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1567"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1572"/> <source>Property set.</source> <translation>Propiedad establecida.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1617"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1622"/> <source>Property deleted.</source> <translation>Propiedad borrada.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> <source>Subversion Lock</source> <translation>Bloqueo de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> <source>Enter lock comment</source> <translation>Introducir comentario para el bloqueo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1869"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1874"/> <source>Relocating</source> <translation>Realojando</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1895"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> <source>Repository Browser</source> <translation>Navegador de Repositorios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1895"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> <source>Enter the repository URL.</source> <translation>Introducir la URL del repositorio.</translation> </message> @@ -34702,17 +34702,17 @@ <translation>Sin versionar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1919"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1924"/> <source>Remove from changelist</source> <translation>Quitar de la lista de cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1955"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1960"/> <source>Add to changelist</source> <translation>Añadir a la lista de cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1945"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1950"/> <source>Enter name of the changelist:</source> <translation>Introduzca el nombre de la lista de cambios:</translation> </message> @@ -34747,22 +34747,22 @@ <translation>Haciendo un tag {0} en el repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1083"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1085"/> <source>Switching to {0}</source> <translation>Haciendo un switch a {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1182"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1187"/> <source>Merging {0}</source> <translation>Haciendo un merge de {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1302"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1307"/> <source>Cleaning up {0}</source> <translation>Limpiando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1489"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> @@ -34778,7 +34778,7 @@ <translation>Commit realizado para revisión {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1090"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1092"/> <source>Revision {0}. </source> <translation>Revisión {0}.</translation> @@ -35604,12 +35604,12 @@ <translation>Seleccione el campo de filtrado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="553"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> <source>Author</source> <translation>Autor</translation> </message> @@ -44741,7 +44741,7 @@ <translation>Actualizar</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="353"/> + <location filename="VCS/ProjectHelper.py" line="435"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> @@ -44755,6 +44755,11 @@ <source>The project retrieved from the repository does not contain an eric project file (*.e4p). Create it?</source> <translation>El proyecto recuperado del repositorio no contiene un archivo de proyecto de eric (*.e4p). ¿Desea crearlo?</translation> </message> + <message> + <location filename="VCS/ProjectHelper.py" line="435"/> + <source>Switch</source> + <translation type="unfinished">Hacer switch</translation> + </message> </context> <context> <name>VcsPySvnPlugin</name> @@ -44826,17 +44831,17 @@ <context> <name>VersionControl</name> <message> - <location filename="VCS/VersionControl.py" line="534"/> + <location filename="VCS/VersionControl.py" line="536"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="660"/> + <location filename="VCS/VersionControl.py" line="662"/> <source>Repository status checking is switched off</source> <translation>El chequeo de estado del repositorio está deshabilitado</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="534"/> + <location filename="VCS/VersionControl.py" line="536"/> <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> @@ -47965,17 +47970,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiquetas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -47986,31 +47991,31 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1558"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Pista</b></td><td></td></tr> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Padres</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1092"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Padre #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -48019,7 +48024,7 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48036,7 +48041,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -48280,17 +48285,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1379"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1384"/> <source>unknown</source> <translation>desconocido</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1253"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Información del repositorio</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Revisión actual</b></td><td>{2}</td></tr><tr><td><b>Revisión enviada</b></td><td>{3}</td></tr><tr><td><b>Fecha de envío</b></td><td>{4}</td></tr><tr><td><b>Hora de envío</b></td><td>{5}</td></tr><tr><td><b>Último autor</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1385"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Information del repositorio</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Revisión enviada</b></td><td>{5}</td></tr><tr><td><b>Fecha de envío</b></td><td>{6}</td></tr><tr><td><b>Hora de envio</b></td><td>{7}</td></tr><tr><td><b>Último autor</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_fr.ts Mon May 30 19:21:18 2011 +0200 +++ b/i18n/eric5_fr.ts Mon May 30 19:23:59 2011 +0200 @@ -16765,167 +16765,167 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1043"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source>Select number of entries to show.</source> <translation type="unfinished">Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1501"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1505"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1619"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1648"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1652"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1755"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1797"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2023"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1820"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2118"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2017"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2021"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -37747,7 +37747,7 @@ <translation>Exporter un projet du référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> <source>Subversion Error</source> <translation>Erreur Subversion</translation> </message> @@ -37767,12 +37767,12 @@ <translation type="obsolete">Etiquetage de %1 dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1037"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1039"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>Impossible d'atteindre l'URL du référentiel du projet depuis la copie locale. Abandon de l'opération</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>Le format de l'URL du référentiel n'est pas valide. Abandon de l'opération</translation> </message> @@ -37792,7 +37792,7 @@ <translation type="obsolete">Nettoyage de %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1338"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1343"/> <source>Subversion command</source> <translation>Commande Subversion</translation> </message> @@ -37807,22 +37807,22 @@ <translation type="obsolete">Déplacement de %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1551"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1556"/> <source>Subversion Set Property</source> <translation>Propriété Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/> <source>You have to supply a property name. Aborting.</source> <translation>Vous devez donner un nom à la propriété. Abandon.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1602"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1607"/> <source>Subversion Delete Property</source> <translation>Suppression d'une propriété Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1424"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1427"/> <source>Enter property name</source> <translation>Entrer le nom de la propriété</translation> </message> @@ -37857,7 +37857,7 @@ <translation>Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1445"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1450"/> <source>Resolving conficts</source> <translation>Résoudre les confits</translation> </message> @@ -37882,22 +37882,22 @@ <translation>Le projet n'a pu être mis à jour à partir du référentiel.<br />Restauration du contenu initial.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> <source>Subversion Log</source> <translation>Log Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> <source>Select number of entries to show.</source> <translation>Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1786"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1791"/> <source>Locking in the Subversion repository</source> <translation>Verrouillage dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1829"/> <source>Unlocking in the Subversion repository</source> <translation>Déverrouillage dans le référentiel Subversion</translation> </message> @@ -37914,27 +37914,27 @@ </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1567"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1572"/> <source>Property set.</source> <translation>Propriété définie.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1617"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1622"/> <source>Property deleted.</source> <translation>Propriété supprimée.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> <source>Subversion Lock</source> <translation>Verrou Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> <source>Enter lock comment</source> <translation>Entrer un commentaire pour le verrou</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1869"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1874"/> <source>Relocating</source> <translation>Déplacement</translation> </message> @@ -38110,27 +38110,27 @@ <translation>Impossible de lancer l'executable SVN.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1895"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> <source>Repository Browser</source> <translation>Navigateur de référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1895"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> <source>Enter the repository URL.</source> <translation>Entrer l'URL du référentiel.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1919"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1924"/> <source>Remove from changelist</source> <translation>Supprimer de la liste des modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1955"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1960"/> <source>Add to changelist</source> <translation>Ajouter à la liste des modifications:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1945"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1950"/> <source>Enter name of the changelist:</source> <translation>Entrer le nom de la liste des modifications:</translation> </message> @@ -38165,22 +38165,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1083"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1085"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1182"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1187"/> <source>Merging {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1302"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1307"/> <source>Cleaning up {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1489"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -38196,7 +38196,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1090"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1092"/> <source>Revision {0}. </source> <translation type="unfinished"></translation> @@ -39151,12 +39151,12 @@ <translation>Log Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="553"/> <source>Revision</source> <translation>Révision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> <source>Author</source> <translation>Auteur</translation> </message> @@ -49052,7 +49052,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="353"/> + <location filename="VCS/ProjectHelper.py" line="435"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -49066,6 +49066,11 @@ <source>The project retrieved from the repository does not contain an eric project file (*.e4p). Create it?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="VCS/ProjectHelper.py" line="435"/> + <source>Switch</source> + <translation type="unfinished">Basculer de version</translation> + </message> </context> <context> <name>VcsPySvnPlugin</name> @@ -49137,7 +49142,7 @@ <context> <name>VersionControl</name> <message> - <location filename="VCS/VersionControl.py" line="534"/> + <location filename="VCS/VersionControl.py" line="536"/> <source>Process Generation Error</source> <translation>Erreur du processus</translation> </message> @@ -49147,12 +49152,12 @@ <translation type="obsolete">Impossible de lancer le processus %1. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="660"/> + <location filename="VCS/VersionControl.py" line="662"/> <source>Repository status checking is switched off</source> <translation>La vérification de statut du référentiel est désactivée</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="534"/> + <location filename="VCS/VersionControl.py" line="536"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -52573,30 +52578,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1092"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -52607,23 +52612,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1558"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -52631,7 +52636,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -52881,7 +52886,7 @@ en cours</b></td><td>%3</td></tr><tr><td><b>Version "commitée"</b></td><td>%4</td></tr><tr><td><b>Date du commit</b></td><td>%5</td></tr><tr><td><b>Heure du commit</b></td><td>%6</td></tr><tr><td><b>Dernier auteur</b></td><td>%7</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1379"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1384"/> <source>unknown</source> <translation>inconnu</translation> </message> @@ -52891,12 +52896,12 @@ <translation type="obsolete"><h3>Informations sur le référentiel</h3><table><tr><td><b>PySvn V.</b></td><td>%1</td></tr><tr><td><b>Subversion V.</b></td><td>%2</td></tr><tr><td><b>API Subversion V.</b></td><td>%3</td></tr><tr><td><b>URL</b></td><td>%4</td></tr><tr><td><b>Révision actuelle</b></td><td>%5</td></tr><tr><td><b>Révision validée</b></td><td>%6</td></tr><tr><td><b>Date de validation</b></td><td>%7</td></tr><tr><td><b>Heure de validation</b></td><td>%8</td></tr><tr><td><b>Dernier auteur</b></td><td>%9</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1253"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1385"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Mon May 30 19:21:18 2011 +0200 +++ b/i18n/eric5_it.ts Mon May 30 19:23:59 2011 +0200 @@ -15298,167 +15298,167 @@ <translation>Merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1043"/> <source>Mercurial command</source> <translation>Comando Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source>Select number of entries to show.</source> <translation>Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> <source>Pulling from a remote Mercurial repository</source> <translation>Pulling da un repository Mercurial remoto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1501"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1505"/> <source>Pushing to a remote Mercurial repository</source> <translation>Pushing in un repository Mercurial remoto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1619"/> <source>Resolving files/directories</source> <translation>Risoluzione di file/directory</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <source>Create Branch</source> <translation>Creazione Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <source>Enter branch name</source> <translation>Inserisci il nome del Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1648"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1652"/> <source>Creating branch in the Mercurial repository</source> <translation>Creazione Branch nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verifica dell'integrità del repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1755"/> <source>Showing the combined configuration settings</source> <translation>Visualizzazione combinata della impostazioni di configurazione</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Showing aliases for remote repositories</source> <translation>Visualizzazione degli alias per i repository remoti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1797"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2023"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027"/> <source>Shall the working directory be updated?</source> <translation>Le directory di lavoro devono essere aggiornate ?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1820"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2118"/> <source>Removing files from the Mercurial repository only</source> <translation>Rimozione di file dal solo repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2017"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2021"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Changegroup Files (*.hg);;All Files (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> <source>Identifying changegroup file</source> <translation>Identifica i file changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file changegroup di Mercurial<b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -34304,7 +34304,7 @@ <translation>Esportazione del progetto dal repository Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> <source>Subversion Error</source> <translation>Subversion Error</translation> </message> @@ -34319,37 +34319,37 @@ <translation>L'URL del repository del progetto a un formato non valido. L'operazione di tag verrà interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1037"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1039"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>L'URL del repository del progetto non può essere recuperato dalla copia di lavoro. L'operazione di switch verrà interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>L'URL del repository del progetto ha un formato non valido. L'operazione di switch verrà interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1338"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1343"/> <source>Subversion command</source> <translation>comando Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1551"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1556"/> <source>Subversion Set Property</source> <translation>Subversion Set Property</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/> <source>You have to supply a property name. Aborting.</source> <translation>Devi fornire un nome per la proprietà. Interrompo.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1602"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1607"/> <source>Subversion Delete Property</source> <translation>Subversion Delete Property</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1424"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1427"/> <source>Enter property name</source> <translation>Inserisci nome proprietà</translation> </message> @@ -34384,7 +34384,7 @@ <translation>Annullamento modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1445"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1450"/> <source>Resolving conficts</source> <translation>Risoluzione conflitti</translation> </message> @@ -34409,47 +34409,47 @@ <translation>Il progetto non può essere checked out dal repository.<br />Ripristisno dei contenuti originali.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> <source>Subversion Log</source> <translation>Log Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> <source>Select number of entries to show.</source> <translation>Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1786"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1791"/> <source>Locking in the Subversion repository</source> <translation>Blocco nel repository Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1829"/> <source>Unlocking in the Subversion repository</source> <translation>Sblocco del repository Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1567"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1572"/> <source>Property set.</source> <translation>Proprietà impostata.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1617"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1622"/> <source>Property deleted.</source> <translation>Proprietà cancellata.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> <source>Subversion Lock</source> <translation>Lock Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> <source>Enter lock comment</source> <translation>Inserico commento del lock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1869"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1874"/> <source>Relocating</source> <translation>Movimentazione</translation> </message> @@ -34614,27 +34614,27 @@ <translation>Non posso avviare l'eseguibile svn.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1895"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> <source>Repository Browser</source> <translation>Browser Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1895"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> <source>Enter the repository URL.</source> <translation>Inserisci l'URL del repository.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1919"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1924"/> <source>Remove from changelist</source> <translation>Rimuovi dalla changelist</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1955"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1960"/> <source>Add to changelist</source> <translation>Aggiungi alla changelist</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1945"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1950"/> <source>Enter name of the changelist:</source> <translation>Inserisci il nome della changelist:</translation> </message> @@ -34669,22 +34669,22 @@ <translation>Tag di{0} nel repository subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1083"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1085"/> <source>Switching to {0}</source> <translation>Switch a {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1182"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1187"/> <source>Merging {0}</source> <translation>Merge di {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1302"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1307"/> <source>Cleaning up {0}</source> <translation>Pulizia di {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1489"/> <source>Copying {0}</source> <translation>copia di {0}</translation> </message> @@ -34700,7 +34700,7 @@ <translation>Committata la revisione {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1090"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1092"/> <source>Revision {0}. </source> <translation>Revisione {0}. @@ -35507,12 +35507,12 @@ <translation>Log Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="553"/> <source>Revision</source> <translation>Revisione</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> <source>Author</source> <translation>Autore</translation> </message> @@ -44672,7 +44672,7 @@ <translation>Aggiorna</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="353"/> + <location filename="VCS/ProjectHelper.py" line="435"/> <source>The project should be reread. Do this now?</source> <translation>Il progetto deve essere riletto. Farlo ora ?</translation> </message> @@ -44686,6 +44686,11 @@ <source>The project retrieved from the repository does not contain an eric project file (*.e4p). Create it?</source> <translation>Il progetto scaricato dal repository non contiene un file progetto di eric ((*.e4p). Crearlo ?</translation> </message> + <message> + <location filename="VCS/ProjectHelper.py" line="435"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VcsPySvnPlugin</name> @@ -44757,17 +44762,17 @@ <context> <name>VersionControl</name> <message> - <location filename="VCS/VersionControl.py" line="534"/> + <location filename="VCS/VersionControl.py" line="536"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="660"/> + <location filename="VCS/VersionControl.py" line="662"/> <source>Repository status checking is switched off</source> <translation>Il controllo dello stato del repository è spento</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="534"/> + <location filename="VCS/VersionControl.py" line="536"/> <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> @@ -47897,24 +47902,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1092"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Origine #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tags</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -47923,7 +47928,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -47940,24 +47945,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1558"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Origini</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -47967,7 +47972,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -48211,17 +48216,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1379"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1384"/> <source>unknown</source> <translation>sconosciuto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1253"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Informazioni Repository</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Revisione corrente </b></td><td>{2}</td></tr><tr><td><b>Revisione committata</b></td><td>{3}</td></tr><tr><td><b>Data della commit</b></td><td>{4}</td></tr><tr><td><b>Ora della commit</b></td><td>{5}</td></tr><tr><td><b>Ultimo autore</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1385"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Informazioni Repository</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Revisione corrente</b></td><td>{4}</td></tr><tr><td><b>Revisione Committata</b></td><td>{5}</td></tr><tr><td><b>Data della commit</b></td><td>{6}</td></tr><tr><td><b>Ora della commit</b></td><td>{7}</td></tr><tr><td><b>Ultimo autore</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_ru.ts Mon May 30 19:21:18 2011 +0200 +++ b/i18n/eric5_ru.ts Mon May 30 19:23:59 2011 +0200 @@ -15395,32 +15395,32 @@ <translation>Слияние</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source>Mercurial Log</source> <translation>лог</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source>Select number of entries to show.</source> <translation>Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> <source>Pulling from a remote Mercurial repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1501"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1505"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1619"/> <source>Resolving files/directories</source> <translation>Разрешение конфликтов</translation> </message> @@ -15435,137 +15435,137 @@ <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1043"/> <source>Mercurial command</source> <translation>Mercurial команда</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <source>Create Branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <source>Enter branch name</source> <translation>Введите имя ветви</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1648"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1652"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1755"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1797"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2023"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/> <source>Showing current branch</source> <translation>Текущая ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная подкоманда ({0}) для Bisect.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1820"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> <source>Identifying project directory</source> <translation>Каталог проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2118"/> <source>Removing files from the Mercurial repository only</source> <translation>Удаление файлов только из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2017"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2021"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> <source>Identifying changegroup file</source> <translation>Файлы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл группы изменений<b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -34454,7 +34454,7 @@ <translation>Экспорт файлов из репозитория Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> <source>Subversion Error</source> <translation>Ошибка Subversion</translation> </message> @@ -34474,37 +34474,37 @@ <translation>Изменение тегов '{0}' в репозитории Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1037"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1039"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>URL репозитория проекта недоступен из рабочей копии. Операция переключения будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>Неверный формат URL репозитория. Операция переключения будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1083"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1085"/> <source>Switching to {0}</source> <translation>Преключение на '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1182"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1187"/> <source>Merging {0}</source> <translation>Слияние с '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1302"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1307"/> <source>Cleaning up {0}</source> <translation>Очистка {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1338"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1343"/> <source>Subversion command</source> <translation>Команда Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1489"/> <source>Copying {0}</source> <translation>Копирование '{0}'</translation> </message> @@ -34514,22 +34514,22 @@ <translation>Перемещение {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1551"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1556"/> <source>Subversion Set Property</source> <translation>Установить свойство Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/> <source>You have to supply a property name. Aborting.</source> <translation>Необходимо задать имя свойства. Прервано.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1602"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1607"/> <source>Subversion Delete Property</source> <translation>Удалить свойство Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1424"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1427"/> <source>Enter property name</source> <translation>Задайте имя свойства</translation> </message> @@ -34564,7 +34564,7 @@ <translation>Отменяю изменения</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1445"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1450"/> <source>Resolving conficts</source> <translation>Разрешаю конфликт</translation> </message> @@ -34589,22 +34589,22 @@ <translation>Невозможно загрузить проект из репозитория. <br />Восстанавливаю предыдущее содержимое.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> <source>Subversion Log</source> <translation>Журнал Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> <source>Select number of entries to show.</source> <translation>Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1786"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1791"/> <source>Locking in the Subversion repository</source> <translation>Захватываю файл/каталог в репозитории Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1829"/> <source>Unlocking in the Subversion repository</source> <translation>Освобождаю файл/каталог в репозитории Subversion</translation> </message> @@ -34614,33 +34614,33 @@ <translation>Сохранена ревизия {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1090"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1092"/> <source>Revision {0}. </source> <translation>Ревизия {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1567"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1572"/> <source>Property set.</source> <translation>Свойство установлено.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1617"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1622"/> <source>Property deleted.</source> <translation>Свойство удалено.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> <source>Subversion Lock</source> <translation>Запереть</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> <source>Enter lock comment</source> <translation>Задайте комментарий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1869"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1874"/> <source>Relocating</source> <translation>Перемещаю</translation> </message> @@ -34816,27 +34816,27 @@ <translation>Невозможно запустить исполняемый файл svn.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1895"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> <source>Repository Browser</source> <translation>Проводник репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1895"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> <source>Enter the repository URL.</source> <translation>Задайте URL репозитория.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1919"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1924"/> <source>Remove from changelist</source> <translation>Удалить из списка изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1955"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1960"/> <source>Add to changelist</source> <translation>Добавить к списку изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1945"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1950"/> <source>Enter name of the changelist:</source> <translation>Введите имя списка изменений:</translation> </message> @@ -35653,12 +35653,12 @@ <translation>Журнал Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="553"/> <source>Revision</source> <translation>Версия (ревизия)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> <source>Author</source> <translation>Автор</translation> </message> @@ -44888,7 +44888,7 @@ <translation>Обновить</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="353"/> + <location filename="VCS/ProjectHelper.py" line="435"/> <source>The project should be reread. Do this now?</source> <translation>Необходимо перезагрузить проект. Сделать это?</translation> </message> @@ -44897,6 +44897,11 @@ <source>The project retrieved from the repository does not contain an eric project file (*.e4p). Create it?</source> <translation>В проекте отсутствует файл описания проекта (*.e4p). Создать?</translation> </message> + <message> + <location filename="VCS/ProjectHelper.py" line="435"/> + <source>Switch</source> + <translation type="unfinished">Переключиться</translation> + </message> </context> <context> <name>VcsPySvnPlugin</name> @@ -44968,17 +44973,17 @@ <context> <name>VersionControl</name> <message> - <location filename="VCS/VersionControl.py" line="534"/> + <location filename="VCS/VersionControl.py" line="536"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="534"/> + <location filename="VCS/VersionControl.py" line="536"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="660"/> + <location filename="VCS/VersionControl.py" line="662"/> <source>Repository status checking is switched off</source> <translation>Проверка статуса репозитория отключена</translation> </message> @@ -48146,17 +48151,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Метки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Ветви</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -48167,30 +48172,30 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1558"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Изменения</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1092"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Предок #{0}</b></td><td></td></tr> <tr><td><b>Изменения</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -48200,7 +48205,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48217,7 +48222,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -48461,17 +48466,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1379"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1384"/> <source>unknown</source> <translation>неизвестный</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1253"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Информация о репозитории</h3><table><tr><td><b>Версия Subversion:</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Текущая ревизия</b></td><td>{2}</td></tr><tr><td><b>Зафиксированная ревизия (committed)</b></td><td>{3}</td></tr><tr><td><b>Дата сохранения</b></td><td>{4}</td></tr><tr><td><b>Время сохранения</b></td><td>{5}</td></tr><tr><td><b>Последний автор</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1385"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Информация о репозитории</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Текущая ревизия</b></td><td>{4}</td></tr><tr><td><b>Зафиксированная ревизия</b></td><td>{5}</td></tr><tr><td><b>Дата сохранения</b></td><td>{6}</td></tr><tr><td><b>Время сохранения</b></td><td>{7}</td></tr><tr><td><b>Автор последней ревизии</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_tr.ts Mon May 30 19:21:18 2011 +0200 +++ b/i18n/eric5_tr.ts Mon May 30 19:23:59 2011 +0200 @@ -15553,167 +15553,167 @@ <translation>Birleştiriliyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1043"/> <source>Mercurial command</source> <translation>Mercurial komut</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source>Mercurial Log</source> <translation>Mercurial Günlüğü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source>Select number of entries to show.</source> <translation>Gösterilecek giriş sayısını seçiniz.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> <source>Pulling from a remote Mercurial repository</source> <translation>Uzak Mercurial kaynak havuzundan çekiliyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1501"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1505"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1619"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <source>Create Branch</source> <translation>Sınıf(Branş) Oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <source>Enter branch name</source> <translation>Sınıf(Branş) adını gir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1648"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1652"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1755"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1797"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1820"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p><b>{0}</b> dosyası halihazırda bulunuyor. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Değiştirme grubu Dosyaları (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2017"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2021"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Değişimgrubu Dosyaları (*.hg);;Tüm Dosyalar (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2023"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2118"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -34692,7 +34692,7 @@ <translation>Taşınıyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> <source>Subversion Error</source> <translation>Altsürüm Hatası</translation> </message> @@ -34717,112 +34717,112 @@ <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1037"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1039"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1083"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1085"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1182"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1187"/> <source>Merging {0}</source> <translation>Birleştiriliyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1302"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1307"/> <source>Cleaning up {0}</source> <translation>Temizle {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1338"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1343"/> <source>Subversion command</source> <translation>Altsürüm komutu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1445"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1450"/> <source>Resolving conficts</source> <translation>Çelişki çözümleniyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1489"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1551"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1556"/> <source>Subversion Set Property</source> <translation>Altsürüm Özelliklerini Ayarla</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/> <source>You have to supply a property name. Aborting.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1602"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1607"/> <source>Subversion Delete Property</source> <translation>Altsürüm Silme Önceliği</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1424"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1427"/> <source>Enter property name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> <source>Subversion Log</source> <translation>Altsürüm Kayıtı</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> <source>Select number of entries to show.</source> <translation>Gösterilecek giriş sayısını seçiniz.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1786"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1791"/> <source>Locking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1829"/> <source>Unlocking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1869"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1874"/> <source>Relocating</source> <translation>Yeniden konumlandırılıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1895"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> <source>Repository Browser</source> <translation>Kaynak Havuzu Gözatıcısı</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1895"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> <source>Enter the repository URL.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1919"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1924"/> <source>Remove from changelist</source> <translation>Değişiklik listesinden çıkar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1955"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1960"/> <source>Add to changelist</source> <translation>Değişiklik listesine ekle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1945"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1950"/> <source>Enter name of the changelist:</source> <translation>Değişiklik listesi adını giriniz:</translation> </message> @@ -34838,29 +34838,29 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1090"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1092"/> <source>Revision {0}. </source> <translation>Gözden geçirme {0}. </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1567"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1572"/> <source>Property set.</source> <translation>Özellikleri Ayarla.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1617"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1622"/> <source>Property deleted.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> <source>Subversion Lock</source> <translation>Altsürüm Kilidi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> <source>Enter lock comment</source> <translation type="unfinished"></translation> </message> @@ -35851,12 +35851,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="553"/> <source>Revision</source> <translation>Gözden Geçirme</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> <source>Author</source> <translation>Yazar</translation> </message> @@ -44976,7 +44976,7 @@ <translation>Güncelle</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="353"/> + <location filename="VCS/ProjectHelper.py" line="435"/> <source>The project should be reread. Do this now?</source> <translation>Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> @@ -44995,6 +44995,11 @@ <source>The project retrieved from the repository does not contain an eric project file (*.e4p). Create it?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="VCS/ProjectHelper.py" line="435"/> + <source>Switch</source> + <translation type="unfinished">Değiştirmek</translation> + </message> </context> <context> <name>VcsPySvnPlugin</name> @@ -45066,17 +45071,17 @@ <context> <name>VersionControl</name> <message> - <location filename="VCS/VersionControl.py" line="534"/> + <location filename="VCS/VersionControl.py" line="536"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="534"/> + <location filename="VCS/VersionControl.py" line="536"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="660"/> + <location filename="VCS/VersionControl.py" line="662"/> <source>Repository status checking is switched off</source> <translation>Kaynak havuzu durum konrol anahtarı kapalı</translation> </message> @@ -48259,24 +48264,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1092"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Esas #{0}</b></td><td></td></tr> <tr><td><b>Değişiklik seti</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiketler</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branşlar</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -48285,7 +48290,7 @@ <tr><td><b>Teslim zamnanı</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48302,23 +48307,23 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1558"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>İp ucu</b></td><td></td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>DEğişiklik seti</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Esas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -48329,7 +48334,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -48573,17 +48578,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1253"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Kaynak Havuzu Bilgisi</h3><table><tr><td><b>Altsürüm V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Geçerli Gözden Geçirme</b></td><td>{2}</td></tr><tr><td><b>Teslim edilen gözden geçirme</b></td><td>{3}</td></tr><tr><td><b>Teslim Tarihi</b></td><td>{4}</td></tr><tr><td><b>Teslim Zamanı</b></td><td>{5}</td></tr><tr><td><b>Son yazar</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1379"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1384"/> <source>unknown</source> <translation>bilinmeyen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1385"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>KAynak Havuzu Bilgisi</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Altsürümn V.</b></td><td>{1}</td></tr><tr><td><b>Altsürüm API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Geçerli Gözden Geçirme</b></td><td>{4}</td></tr><tr><td><b>Teslim edilen gözden geçirme</b></td><td>{5}</td></tr><tr><td><b>Teslim tarihi</b></td><td>{6}</td></tr><tr><td><b>Teslim zamanı</b></td><td>{7}</td></tr><tr><td><b>Son yazar</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Mon May 30 19:21:18 2011 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Mon May 30 19:23:59 2011 +0200 @@ -16731,167 +16731,167 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1043"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source>Select number of entries to show.</source> <translation type="unfinished">选择要显示的条目数。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1501"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1505"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1619"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1648"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1652"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1755"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1797"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2023"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1820"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2118"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2017"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2021"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -37780,7 +37780,7 @@ <translation type="obsolete">正在移动 %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> <source>Subversion Error</source> <translation>版本控制错误</translation> </message> @@ -37805,12 +37805,12 @@ <translation>还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1037"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1039"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>项目储存库的 URL 无法从工作拷贝中检索。转换操作将被终止</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>项目储存库的 URL 包含无效格式。转换操作将被终止</translation> </message> @@ -37830,12 +37830,12 @@ <translation type="obsolete">清除 %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1338"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1343"/> <source>Subversion command</source> <translation>版本控制命令</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1445"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1450"/> <source>Resolving conficts</source> <translation>解析冲突</translation> </message> @@ -37845,72 +37845,72 @@ <translation type="obsolete">复制 %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1551"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1556"/> <source>Subversion Set Property</source> <translation>版本控制设置属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/> <source>You have to supply a property name. Aborting.</source> <translation>必须提供一个属性名。终止。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1602"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1607"/> <source>Subversion Delete Property</source> <translation>版本控制删除属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1424"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1427"/> <source>Enter property name</source> <translation>输入属性名</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> <source>Subversion Log</source> <translation>版本控制日志</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> <source>Select number of entries to show.</source> <translation>选择要显示的条目数。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1786"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1791"/> <source>Locking in the Subversion repository</source> <translation>在版本控制储存库中锁定</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1824"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1829"/> <source>Unlocking in the Subversion repository</source> <translation>在版本控制储存库中解锁</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1869"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1874"/> <source>Relocating</source> <translation>重新定位</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1895"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> <source>Repository Browser</source> <translation>储存库浏览器</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1895"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> <source>Enter the repository URL.</source> <translation>输入储存库 URL。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1919"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1924"/> <source>Remove from changelist</source> <translation>从更改列表中移除</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1955"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1960"/> <source>Add to changelist</source> <translation>添加更改列表</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1945"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1950"/> <source>Enter name of the changelist:</source> <translation>输入更改列表名称：</translation> </message> @@ -37934,22 +37934,22 @@ </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1567"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1572"/> <source>Property set.</source> <translation>属性设置。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1617"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1622"/> <source>Property deleted.</source> <translation>属性已删除。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> <source>Subversion Lock</source> <translation>版本控制锁定</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> <source>Enter lock comment</source> <translation>输入锁定注释</translation> </message> @@ -38134,22 +38134,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1083"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1085"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1182"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1187"/> <source>Merging {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1302"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1307"/> <source>Cleaning up {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1484"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1489"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -38165,7 +38165,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1090"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1092"/> <source>Revision {0}. </source> <translation type="unfinished"></translation> @@ -39148,12 +39148,12 @@ <translation>选择要过滤的区域</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="553"/> <source>Revision</source> <translation>修订</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> <source>Author</source> <translation>作者</translation> </message> @@ -49024,7 +49024,7 @@ <translation type="unfinished">更新</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="353"/> + <location filename="VCS/ProjectHelper.py" line="435"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -49038,6 +49038,11 @@ <source>The project retrieved from the repository does not contain an eric project file (*.e4p). Create it?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="VCS/ProjectHelper.py" line="435"/> + <source>Switch</source> + <translation type="unfinished">转换</translation> + </message> </context> <context> <name>VcsPySvnPlugin</name> @@ -49109,7 +49114,7 @@ <context> <name>VersionControl</name> <message> - <location filename="VCS/VersionControl.py" line="534"/> + <location filename="VCS/VersionControl.py" line="536"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> @@ -49119,12 +49124,12 @@ <translation type="obsolete">无法启动进程 %1，在搜索路径中。</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="660"/> + <location filename="VCS/VersionControl.py" line="662"/> <source>Repository status checking is switched off</source> <translation>储存库状态检查被关闭</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="534"/> + <location filename="VCS/VersionControl.py" line="536"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -52532,30 +52537,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1092"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -52566,23 +52571,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1558"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -52590,7 +52595,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -52839,7 +52844,7 @@ <translation type="obsolete"><h3>储存库信息</h3><table><tr><td><b>版本控制版本</b></td><td>%1</td></tr><tr><td><b>URL</b></td><td>%2</td></tr><tr><td><b>当前修订</b></td><td>%3</td></tr><tr><td><b>已提交的修订</b></td><td>%4</td></tr><tr><td><b>提交日期</b></td><td>%5</td></tr><tr><td><b>提交时间</b></td><td>%6</td></tr><tr><td><b>最终作者</b></td><td>%7</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1379"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1384"/> <source>unknown</source> <translation>未知</translation> </message> @@ -52849,12 +52854,12 @@ <translation type="obsolete"><h3>储存库信息</h3><table><tr><td><b>PySvn 版本</b></td><td>%1</td></tr><tr><td><b>版本控制版本</b></td><td>%2</td></tr><tr><td><b>版本控制 API 版本</b></td><td>%3</td></tr><tr><td><b>URL</b></td><td>%4</td></tr><tr><td><b>当前修订</b></td><td>%5</td></tr><tr><td><b>已提交的修订</b></td><td>%6</td></tr><tr><td><b>提交日期</b></td><td>%7</td></tr><tr><td><b>提交时间</b></td><td>%8</td></tr><tr><td><b>最终作者</b></td><td>%9</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1253"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1385"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation type="unfinished"></translation> </message>
