--- a/i18n/eric5_en.ts Thu Aug 18 12:36:53 2011 +0200 +++ b/i18n/eric5_en.ts Thu Aug 18 18:03:22 2011 +0200 @@ -3097,32 +3097,32 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="71"/> + <location filename="Cooperation/Connection.py" line="72"/> <source>undefined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="72"/> + <location filename="Cooperation/Connection.py" line="73"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="186"/> - <source>* Connection attempted by banned user '{0}'.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Cooperation/Connection.py" line="196"/> + <source>* Connection attempted by banned user '{0}'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/Connection.py" line="206"/> <source>New Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="196"/> + <location filename="Cooperation/Connection.py" line="206"/> <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="416"/> + <location filename="Cooperation/Connection.py" line="431"/> <source>* Connection to {0}:{1} refused.</source> <translation type="unfinished"></translation> </message> @@ -3463,16 +3463,21 @@ <context> <name>CooperationClient</name> <message> - <location filename="Cooperation/CooperationClient.py" line="71"/> + <location filename="Cooperation/CooperationClient.py" line="83"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="272"/> - <source>Illegal address: {0}:{1} + <location filename="Cooperation/CooperationClient.py" line="286"/> + <source>Illegal address: {0}@{1} </source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Cooperation/CooperationClient.py" line="377"/> + <source>No servers present.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CooperationPage</name> @@ -15321,112 +15326,112 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1736"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> <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="1943"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1904"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> <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="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2025"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2005"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2006"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2042"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2031"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2090"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2158"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -24445,52 +24450,52 @@ <context> <name>NetworkAccessManager</name> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="169"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="170"/> <source><b>Enter username and password for '{0}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="172"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="173"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> <source>SSL Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="239"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> <source>Certificates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="239"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="292"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="294"/> <source><br/>Issuer: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="296"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="298"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="284"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> <source>Name: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="288"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="290"/> <source><br/>Organization: {0}</source> <translation type="unfinished"></translation> </message> @@ -43771,7 +43776,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5657"/> + <location filename="UI/UserInterface.py" line="5673"/> <source></table></source> <translation type="unfinished"></translation> </message> @@ -44043,57 +44048,57 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5610"/> + <location filename="UI/UserInterface.py" line="5626"/> <source>Update available</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5610"/> + <location filename="UI/UserInterface.py" line="5626"/> <source>The update to <b>{0}</b> of eric5 is available at <b>{1}</b>. Would you like to get it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5619"/> + <location filename="UI/UserInterface.py" line="5635"/> <source>Eric5 is up to date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5619"/> + <location filename="UI/UserInterface.py" line="5635"/> <source>You are using the latest version of eric5</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5623"/> + <location filename="UI/UserInterface.py" line="5639"/> <source>Error during updates check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5623"/> + <location filename="UI/UserInterface.py" line="5639"/> <source>Could not perform updates check.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5644"/> + <location filename="UI/UserInterface.py" line="5660"/> <source><h3>Available versions</h3><table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5672"/> + <location filename="UI/UserInterface.py" line="5688"/> <source>SSL Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5672"/> + <location filename="UI/UserInterface.py" line="5688"/> <source><p>SSL Errors:</p><p>{0}</p><p>Do you want to ignore these errors?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5697"/> + <location filename="UI/UserInterface.py" line="5713"/> <source>First time usage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5697"/> + <location filename="UI/UserInterface.py" line="5713"/> <source>eric5 has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished"></translation> </message> @@ -44138,12 +44143,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5537"/> + <location filename="UI/UserInterface.py" line="5553"/> <source>Error getting versions information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5537"/> + <location filename="UI/UserInterface.py" line="5547"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -44157,6 +44162,11 @@ <source>Could not start a web browser</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="UI/UserInterface.py" line="5553"/> + <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name>