Sat, 29 Dec 2012 17:16:46 +0100
Fixed an issue in the IRC widget and updated the translations.
Network/IRC/IrcWidget.py | file | annotate | diff | comparison | revisions | |
i18n/eric5_cs.ts | file | annotate | diff | comparison | revisions | |
i18n/eric5_de.qm | file | annotate | diff | comparison | revisions | |
i18n/eric5_de.ts | file | annotate | diff | comparison | revisions | |
i18n/eric5_en.ts | file | annotate | diff | comparison | revisions | |
i18n/eric5_es.ts | file | annotate | diff | comparison | revisions | |
i18n/eric5_fr.ts | file | annotate | diff | comparison | revisions | |
i18n/eric5_it.ts | file | annotate | diff | comparison | revisions | |
i18n/eric5_ru.ts | file | annotate | diff | comparison | revisions | |
i18n/eric5_tr.ts | file | annotate | diff | comparison | revisions | |
i18n/eric5_zh_CN.GB2312.ts | file | annotate | diff | comparison | revisions |
diff -r 1991e0bd6012 -r 1e29752b51d7 Network/IRC/IrcWidget.py --- a/Network/IRC/IrcWidget.py Wed Dec 26 15:42:52 2012 +0100 +++ b/Network/IRC/IrcWidget.py Sat Dec 29 17:16:46 2012 +0100 @@ -694,10 +694,17 @@ self.networkWidget.addErrorMessage(self.trUtf8("Socket Error"), self.trUtf8("The connection was refused by the peer. Please check the" " host name and port settings.")) - else: + elif error == QAbstractSocket.SslHandshakeFailedError: self.networkWidget.addErrorMessage(self.trUtf8("Socket Error"), - self.trUtf8("The following network error occurred:<br/>{0}").format( - self.__socket.errorString())) + self.trUtf8("The SSL handshake failed.")) + else: + if self.__socket: + self.networkWidget.addErrorMessage(self.trUtf8("Socket Error"), + self.trUtf8("The following network error occurred:<br/>{0}").format( + self.__socket.errorString())) + else: + self.networkWidget.addErrorMessage(self.trUtf8("Socket Error"), + self.trUtf8("A network error occurred.")) def __sslErrors(self, errors): """
diff -r 1991e0bd6012 -r 1e29752b51d7 i18n/eric5_cs.ts --- a/i18n/eric5_cs.ts Wed Dec 26 15:42:52 2012 +0100 +++ b/i18n/eric5_cs.ts Sat Dec 29 17:16:46 2012 +0100 @@ -27630,7 +27630,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="733"/> + <location filename="Network/IRC/IrcWidget.py" line="740"/> <source>SSL Error</source> <translation type="unfinished"></translation> </message> @@ -27640,7 +27640,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="698"/> + <location filename="Network/IRC/IrcWidget.py" line="706"/> <source>Socket Error</source> <translation type="unfinished"></translation> </message> @@ -27655,73 +27655,73 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="698"/> + <location filename="Network/IRC/IrcWidget.py" line="702"/> <source>The following network error occurred:<br/>{0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="715"/> + <location filename="Network/IRC/IrcWidget.py" line="722"/> <source>SSL Errors</source> <translation type="unfinished">SSL chyby</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="715"/> + <location filename="Network/IRC/IrcWidget.py" line="722"/> <source><p>SSL Errors:</p><p>{0}</p><p>Do you want to ignore these errors?</p></source> <translation type="unfinished"><p>SSL chyby:</p><p>{0}</p><p>Chcete tyto chyby ignorovat?</p></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="726"/> - <source>The SSL certificate for the server {0} (port {1}) failed the authenticity check.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Network/IRC/IrcWidget.py" line="733"/> + <source>The SSL certificate for the server {0} (port {1}) failed the authenticity check.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="740"/> <source>Could not connect to {0} (port {1}) using an SSL encrypted connection. Either the server does not support SSL (did you use the correct port?) or you rejected the certificate.<br/>{2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="818"/> + <location filename="Network/IRC/IrcWidget.py" line="825"/> <source>{0} ({1})</source> <comment>channel name, users count</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="847"/> + <location filename="Network/IRC/IrcWidget.py" line="854"/> <source>Critical</source> <translation type="unfinished">Kritický</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="832"/> + <location filename="Network/IRC/IrcWidget.py" line="839"/> <source>No nickname acceptable to the server configured for <b>{0}</b>. Disconnecting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="847"/> + <location filename="Network/IRC/IrcWidget.py" line="854"/> <source>The given nickname is already in use.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="805"/> + <location filename="Network/IRC/IrcWidget.py" line="812"/> <source>CTCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="789"/> + <location filename="Network/IRC/IrcWidget.py" line="796"/> <source>Received Version request from {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="794"/> + <location filename="Network/IRC/IrcWidget.py" line="801"/> <source>Received CTCP-PING request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="799"/> + <location filename="Network/IRC/IrcWidget.py" line="806"/> <source>Received CTCP-CLIENTINFO request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="805"/> + <location filename="Network/IRC/IrcWidget.py" line="812"/> <source>Received unknown CTCP-{0} request from {1}.</source> <translation type="unfinished"></translation> </message> @@ -27745,6 +27745,16 @@ <source>Network</source> <translation type="unfinished">Síť</translation> </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="698"/> + <source>The SSL handshake failed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="706"/> + <source>A network error occurred.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>JavaScriptEricObject</name>
diff -r 1991e0bd6012 -r 1e29752b51d7 i18n/eric5_de.ts --- a/i18n/eric5_de.ts Wed Dec 26 15:42:52 2012 +0100 +++ b/i18n/eric5_de.ts Sat Dec 29 17:16:46 2012 +0100 @@ -2730,7 +2730,7 @@ <message> <location filename="Cooperation/ChatWidget.ui" line="210"/> <source>Enter the host and port to connect to in the form "host@port"</source> - <translation type="unfinished">Gib den Host und den Port in der Form "Host@Port" für die Verbindung ein</translation> + <translation>Gib den Host und den Port in der Form "Host@Port" für die Verbindung ein</translation> </message> </context> <context> @@ -26825,7 +26825,7 @@ <translation>Sie sind als "abwesend" gekennzeichnet.</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="733"/> + <location filename="Network/IRC/IrcWidget.py" line="740"/> <source>SSL Error</source> <translation>SSL Fehler</translation> </message> @@ -26835,7 +26835,7 @@ <translation>Die Verbindung zum Server {0} (Port {1}) wurde während des Wartens auf eine Benutzerantwort auf einen SSL Fehler verloren.</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="698"/> + <location filename="Network/IRC/IrcWidget.py" line="706"/> <source>Socket Error</source> <translation>Socker Fehler</translation> </message> @@ -26850,73 +26850,73 @@ <translation>Die Verbindung wurde von der Gegenseite abgelehnt. Bitte prüfen sie den Servernamen und die Porteinstellungen.</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="698"/> + <location filename="Network/IRC/IrcWidget.py" line="702"/> <source>The following network error occurred:<br/>{0}</source> <translation>Der folgende Netzwerkfehler trat auf:<br/>{0}</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="715"/> + <location filename="Network/IRC/IrcWidget.py" line="722"/> <source>SSL Errors</source> <translation>SSL Fehler</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="715"/> + <location filename="Network/IRC/IrcWidget.py" line="722"/> <source><p>SSL Errors:</p><p>{0}</p><p>Do you want to ignore these errors?</p></source> <translation><p>SSL Fehler</p><p>{0}</p><p>Wollen Sie diese Fehler ignorieren?</p></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="726"/> - <source>The SSL certificate for the server {0} (port {1}) failed the authenticity check.</source> - <translation>Das SSL Zertifikat für den Server {0} (Port {1}) hat die Authentizitätsprüfung nicht bestanden.</translation> - </message> - <message> <location filename="Network/IRC/IrcWidget.py" line="733"/> + <source>The SSL certificate for the server {0} (port {1}) failed the authenticity check.</source> + <translation>Das SSL Zertifikat für den Server {0} (Port {1}) hat die Authentizitätsprüfung nicht bestanden.</translation> + </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="740"/> <source>Could not connect to {0} (port {1}) using an SSL encrypted connection. Either the server does not support SSL (did you use the correct port?) or you rejected the certificate.<br/>{2}</source> <translation>Es konnte keine SSL verschlüsselte Verbindung zum Server {0} (Port {1}) aufgebaut werden. Entweder unterstütz der Server kein SSL (haben sie den richtigen Port verwendet?) oder sie haben das Zertifikat abgelehnt.<br/>{2}</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="818"/> + <location filename="Network/IRC/IrcWidget.py" line="825"/> <source>{0} ({1})</source> <comment>channel name, users count</comment> <translation>{0} ({1})</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="847"/> + <location filename="Network/IRC/IrcWidget.py" line="854"/> <source>Critical</source> <translation>Kritischer Fehler</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="832"/> + <location filename="Network/IRC/IrcWidget.py" line="839"/> <source>No nickname acceptable to the server configured for <b>{0}</b>. Disconnecting...</source> <translation>Es ist kein für den Server <b>{0}</b> akzeptabler Spitzname konfiguriert. Verbindungsabbruch...</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="847"/> + <location filename="Network/IRC/IrcWidget.py" line="854"/> <source>The given nickname is already in use.</source> <translation>Der übergebene Spitzname wird bereits verwendet.</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="805"/> + <location filename="Network/IRC/IrcWidget.py" line="812"/> <source>CTCP</source> <translation>CTCP</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="789"/> + <location filename="Network/IRC/IrcWidget.py" line="796"/> <source>Received Version request from {0}.</source> <translation>Versionsanfrage von {0} empfangen.</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="794"/> + <location filename="Network/IRC/IrcWidget.py" line="801"/> <source>Received CTCP-PING request from {0}, sending answer.</source> <translation>CTCP-PING-Anfrage von {0} empfangen, Antwort wird gesendet.</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="799"/> + <location filename="Network/IRC/IrcWidget.py" line="806"/> <source>Received CTCP-CLIENTINFO request from {0}, sending answer.</source> <translation>CTCP-CLIENTINFO-Anfrage von {0} empfangen, Antwort wird gesendet.</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="805"/> + <location filename="Network/IRC/IrcWidget.py" line="812"/> <source>Received unknown CTCP-{0} request from {1}.</source> <translation>Unbekannte CTCP-{0}-Anfrage von {1} empfangen.</translation> </message> @@ -26940,6 +26940,16 @@ <source>Network</source> <translation>Netzwerk</translation> </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="698"/> + <source>The SSL handshake failed.</source> + <translation>Der SSL Handshake schlug fehl.</translation> + </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="706"/> + <source>A network error occurred.</source> + <translation>Ein Netzwerkfehler trat auf.</translation> + </message> </context> <context> <name>JavaScriptEricObject</name>
diff -r 1991e0bd6012 -r 1e29752b51d7 i18n/eric5_en.ts --- a/i18n/eric5_en.ts Wed Dec 26 15:42:52 2012 +0100 +++ b/i18n/eric5_en.ts Sat Dec 29 17:16:46 2012 +0100 @@ -26677,7 +26677,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="733"/> + <location filename="Network/IRC/IrcWidget.py" line="740"/> <source>SSL Error</source> <translation type="unfinished"></translation> </message> @@ -26687,7 +26687,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="698"/> + <location filename="Network/IRC/IrcWidget.py" line="706"/> <source>Socket Error</source> <translation type="unfinished"></translation> </message> @@ -26702,73 +26702,73 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="698"/> + <location filename="Network/IRC/IrcWidget.py" line="702"/> <source>The following network error occurred:<br/>{0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="715"/> + <location filename="Network/IRC/IrcWidget.py" line="722"/> <source>SSL Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="715"/> + <location filename="Network/IRC/IrcWidget.py" line="722"/> <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="Network/IRC/IrcWidget.py" line="726"/> - <source>The SSL certificate for the server {0} (port {1}) failed the authenticity check.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Network/IRC/IrcWidget.py" line="733"/> + <source>The SSL certificate for the server {0} (port {1}) failed the authenticity check.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="740"/> <source>Could not connect to {0} (port {1}) using an SSL encrypted connection. Either the server does not support SSL (did you use the correct port?) or you rejected the certificate.<br/>{2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="818"/> + <location filename="Network/IRC/IrcWidget.py" line="825"/> <source>{0} ({1})</source> <comment>channel name, users count</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="847"/> + <location filename="Network/IRC/IrcWidget.py" line="854"/> <source>Critical</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="832"/> + <location filename="Network/IRC/IrcWidget.py" line="839"/> <source>No nickname acceptable to the server configured for <b>{0}</b>. Disconnecting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="847"/> + <location filename="Network/IRC/IrcWidget.py" line="854"/> <source>The given nickname is already in use.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="805"/> + <location filename="Network/IRC/IrcWidget.py" line="812"/> <source>CTCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="789"/> + <location filename="Network/IRC/IrcWidget.py" line="796"/> <source>Received Version request from {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="794"/> + <location filename="Network/IRC/IrcWidget.py" line="801"/> <source>Received CTCP-PING request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="799"/> + <location filename="Network/IRC/IrcWidget.py" line="806"/> <source>Received CTCP-CLIENTINFO request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="805"/> + <location filename="Network/IRC/IrcWidget.py" line="812"/> <source>Received unknown CTCP-{0} request from {1}.</source> <translation type="unfinished"></translation> </message> @@ -26792,6 +26792,16 @@ <source>Network</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="698"/> + <source>The SSL handshake failed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="706"/> + <source>A network error occurred.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>JavaScriptEricObject</name>
diff -r 1991e0bd6012 -r 1e29752b51d7 i18n/eric5_es.ts --- a/i18n/eric5_es.ts Wed Dec 26 15:42:52 2012 +0100 +++ b/i18n/eric5_es.ts Sat Dec 29 17:16:46 2012 +0100 @@ -27113,7 +27113,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="733"/> + <location filename="Network/IRC/IrcWidget.py" line="740"/> <source>SSL Error</source> <translation type="unfinished"></translation> </message> @@ -27123,7 +27123,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="698"/> + <location filename="Network/IRC/IrcWidget.py" line="706"/> <source>Socket Error</source> <translation type="unfinished"></translation> </message> @@ -27138,73 +27138,73 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="698"/> + <location filename="Network/IRC/IrcWidget.py" line="702"/> <source>The following network error occurred:<br/>{0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="715"/> + <location filename="Network/IRC/IrcWidget.py" line="722"/> <source>SSL Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="715"/> + <location filename="Network/IRC/IrcWidget.py" line="722"/> <source><p>SSL Errors:</p><p>{0}</p><p>Do you want to ignore these errors?</p></source> <translation type="unfinished"><p>Errores SSL:</p><p>{0}</p><p>¿Desea ignorar estos errores?</p></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="726"/> - <source>The SSL certificate for the server {0} (port {1}) failed the authenticity check.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Network/IRC/IrcWidget.py" line="733"/> + <source>The SSL certificate for the server {0} (port {1}) failed the authenticity check.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="740"/> <source>Could not connect to {0} (port {1}) using an SSL encrypted connection. Either the server does not support SSL (did you use the correct port?) or you rejected the certificate.<br/>{2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="818"/> + <location filename="Network/IRC/IrcWidget.py" line="825"/> <source>{0} ({1})</source> <comment>channel name, users count</comment> <translation type="unfinished">{0} ({1})</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="847"/> + <location filename="Network/IRC/IrcWidget.py" line="854"/> <source>Critical</source> <translation type="unfinished">Aviso Crítico</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="832"/> + <location filename="Network/IRC/IrcWidget.py" line="839"/> <source>No nickname acceptable to the server configured for <b>{0}</b>. Disconnecting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="847"/> + <location filename="Network/IRC/IrcWidget.py" line="854"/> <source>The given nickname is already in use.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="805"/> + <location filename="Network/IRC/IrcWidget.py" line="812"/> <source>CTCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="789"/> + <location filename="Network/IRC/IrcWidget.py" line="796"/> <source>Received Version request from {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="794"/> + <location filename="Network/IRC/IrcWidget.py" line="801"/> <source>Received CTCP-PING request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="799"/> + <location filename="Network/IRC/IrcWidget.py" line="806"/> <source>Received CTCP-CLIENTINFO request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="805"/> + <location filename="Network/IRC/IrcWidget.py" line="812"/> <source>Received unknown CTCP-{0} request from {1}.</source> <translation type="unfinished"></translation> </message> @@ -27228,6 +27228,16 @@ <source>Network</source> <translation type="unfinished">Red</translation> </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="698"/> + <source>The SSL handshake failed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="706"/> + <source>A network error occurred.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>JavaScriptEricObject</name>
diff -r 1991e0bd6012 -r 1e29752b51d7 i18n/eric5_fr.ts --- a/i18n/eric5_fr.ts Wed Dec 26 15:42:52 2012 +0100 +++ b/i18n/eric5_fr.ts Sat Dec 29 17:16:46 2012 +0100 @@ -28665,7 +28665,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="733"/> + <location filename="Network/IRC/IrcWidget.py" line="740"/> <source>SSL Error</source> <translation type="unfinished"></translation> </message> @@ -28675,7 +28675,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="698"/> + <location filename="Network/IRC/IrcWidget.py" line="706"/> <source>Socket Error</source> <translation type="unfinished"></translation> </message> @@ -28690,73 +28690,73 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="698"/> + <location filename="Network/IRC/IrcWidget.py" line="702"/> <source>The following network error occurred:<br/>{0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="715"/> + <location filename="Network/IRC/IrcWidget.py" line="722"/> <source>SSL Errors</source> <translation type="unfinished">Erreurs SSL</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="715"/> + <location filename="Network/IRC/IrcWidget.py" line="722"/> <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="Network/IRC/IrcWidget.py" line="726"/> - <source>The SSL certificate for the server {0} (port {1}) failed the authenticity check.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Network/IRC/IrcWidget.py" line="733"/> + <source>The SSL certificate for the server {0} (port {1}) failed the authenticity check.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="740"/> <source>Could not connect to {0} (port {1}) using an SSL encrypted connection. Either the server does not support SSL (did you use the correct port?) or you rejected the certificate.<br/>{2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="818"/> + <location filename="Network/IRC/IrcWidget.py" line="825"/> <source>{0} ({1})</source> <comment>channel name, users count</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="847"/> + <location filename="Network/IRC/IrcWidget.py" line="854"/> <source>Critical</source> <translation type="unfinished">Critique</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="832"/> + <location filename="Network/IRC/IrcWidget.py" line="839"/> <source>No nickname acceptable to the server configured for <b>{0}</b>. Disconnecting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="847"/> + <location filename="Network/IRC/IrcWidget.py" line="854"/> <source>The given nickname is already in use.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="805"/> + <location filename="Network/IRC/IrcWidget.py" line="812"/> <source>CTCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="789"/> + <location filename="Network/IRC/IrcWidget.py" line="796"/> <source>Received Version request from {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="794"/> + <location filename="Network/IRC/IrcWidget.py" line="801"/> <source>Received CTCP-PING request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="799"/> + <location filename="Network/IRC/IrcWidget.py" line="806"/> <source>Received CTCP-CLIENTINFO request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="805"/> + <location filename="Network/IRC/IrcWidget.py" line="812"/> <source>Received unknown CTCP-{0} request from {1}.</source> <translation type="unfinished"></translation> </message> @@ -28780,6 +28780,16 @@ <source>Network</source> <translation type="unfinished">Réseau</translation> </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="698"/> + <source>The SSL handshake failed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="706"/> + <source>A network error occurred.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>JavaScriptEricObject</name>
diff -r 1991e0bd6012 -r 1e29752b51d7 i18n/eric5_it.ts --- a/i18n/eric5_it.ts Wed Dec 26 15:42:52 2012 +0100 +++ b/i18n/eric5_it.ts Sat Dec 29 17:16:46 2012 +0100 @@ -27401,7 +27401,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="733"/> + <location filename="Network/IRC/IrcWidget.py" line="740"/> <source>SSL Error</source> <translation type="unfinished"></translation> </message> @@ -27411,7 +27411,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="698"/> + <location filename="Network/IRC/IrcWidget.py" line="706"/> <source>Socket Error</source> <translation type="unfinished"></translation> </message> @@ -27426,73 +27426,73 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="698"/> + <location filename="Network/IRC/IrcWidget.py" line="702"/> <source>The following network error occurred:<br/>{0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="715"/> + <location filename="Network/IRC/IrcWidget.py" line="722"/> <source>SSL Errors</source> <translation type="unfinished">Errori SSL</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="715"/> + <location filename="Network/IRC/IrcWidget.py" line="722"/> <source><p>SSL Errors:</p><p>{0}</p><p>Do you want to ignore these errors?</p></source> <translation type="unfinished"><p>Errori SSL:</p><p>{0}</p><p>Vuoi ignorare questi errori ?</p></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="726"/> - <source>The SSL certificate for the server {0} (port {1}) failed the authenticity check.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Network/IRC/IrcWidget.py" line="733"/> + <source>The SSL certificate for the server {0} (port {1}) failed the authenticity check.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="740"/> <source>Could not connect to {0} (port {1}) using an SSL encrypted connection. Either the server does not support SSL (did you use the correct port?) or you rejected the certificate.<br/>{2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="818"/> + <location filename="Network/IRC/IrcWidget.py" line="825"/> <source>{0} ({1})</source> <comment>channel name, users count</comment> <translation type="unfinished">{0} ({1})</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="847"/> + <location filename="Network/IRC/IrcWidget.py" line="854"/> <source>Critical</source> <translation type="unfinished">Critico</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="832"/> + <location filename="Network/IRC/IrcWidget.py" line="839"/> <source>No nickname acceptable to the server configured for <b>{0}</b>. Disconnecting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="847"/> + <location filename="Network/IRC/IrcWidget.py" line="854"/> <source>The given nickname is already in use.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="805"/> + <location filename="Network/IRC/IrcWidget.py" line="812"/> <source>CTCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="789"/> + <location filename="Network/IRC/IrcWidget.py" line="796"/> <source>Received Version request from {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="794"/> + <location filename="Network/IRC/IrcWidget.py" line="801"/> <source>Received CTCP-PING request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="799"/> + <location filename="Network/IRC/IrcWidget.py" line="806"/> <source>Received CTCP-CLIENTINFO request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="805"/> + <location filename="Network/IRC/IrcWidget.py" line="812"/> <source>Received unknown CTCP-{0} request from {1}.</source> <translation type="unfinished"></translation> </message> @@ -27516,6 +27516,16 @@ <source>Network</source> <translation type="unfinished">Rete</translation> </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="698"/> + <source>The SSL handshake failed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="706"/> + <source>A network error occurred.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>JavaScriptEricObject</name>
diff -r 1991e0bd6012 -r 1e29752b51d7 i18n/eric5_ru.ts --- a/i18n/eric5_ru.ts Wed Dec 26 15:42:52 2012 +0100 +++ b/i18n/eric5_ru.ts Sat Dec 29 17:16:46 2012 +0100 @@ -27527,7 +27527,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="733"/> + <location filename="Network/IRC/IrcWidget.py" line="740"/> <source>SSL Error</source> <translation type="unfinished"></translation> </message> @@ -27537,7 +27537,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="698"/> + <location filename="Network/IRC/IrcWidget.py" line="706"/> <source>Socket Error</source> <translation type="unfinished"></translation> </message> @@ -27552,73 +27552,73 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="698"/> + <location filename="Network/IRC/IrcWidget.py" line="702"/> <source>The following network error occurred:<br/>{0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="715"/> + <location filename="Network/IRC/IrcWidget.py" line="722"/> <source>SSL Errors</source> <translation type="unfinished">Ошибки SSL</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="715"/> + <location filename="Network/IRC/IrcWidget.py" line="722"/> <source><p>SSL Errors:</p><p>{0}</p><p>Do you want to ignore these errors?</p></source> <translation type="unfinished"><p>Ошибки SSL: </p><p>{0}</p><p>Игнорировать?</p></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="726"/> - <source>The SSL certificate for the server {0} (port {1}) failed the authenticity check.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Network/IRC/IrcWidget.py" line="733"/> + <source>The SSL certificate for the server {0} (port {1}) failed the authenticity check.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="740"/> <source>Could not connect to {0} (port {1}) using an SSL encrypted connection. Either the server does not support SSL (did you use the correct port?) or you rejected the certificate.<br/>{2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="818"/> + <location filename="Network/IRC/IrcWidget.py" line="825"/> <source>{0} ({1})</source> <comment>channel name, users count</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="847"/> + <location filename="Network/IRC/IrcWidget.py" line="854"/> <source>Critical</source> <translation type="unfinished">Ошибка</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="832"/> + <location filename="Network/IRC/IrcWidget.py" line="839"/> <source>No nickname acceptable to the server configured for <b>{0}</b>. Disconnecting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="847"/> + <location filename="Network/IRC/IrcWidget.py" line="854"/> <source>The given nickname is already in use.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="805"/> + <location filename="Network/IRC/IrcWidget.py" line="812"/> <source>CTCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="789"/> + <location filename="Network/IRC/IrcWidget.py" line="796"/> <source>Received Version request from {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="794"/> + <location filename="Network/IRC/IrcWidget.py" line="801"/> <source>Received CTCP-PING request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="799"/> + <location filename="Network/IRC/IrcWidget.py" line="806"/> <source>Received CTCP-CLIENTINFO request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="805"/> + <location filename="Network/IRC/IrcWidget.py" line="812"/> <source>Received unknown CTCP-{0} request from {1}.</source> <translation type="unfinished"></translation> </message> @@ -27642,6 +27642,16 @@ <source>Network</source> <translation type="unfinished">Сеть</translation> </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="698"/> + <source>The SSL handshake failed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="706"/> + <source>A network error occurred.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>JavaScriptEricObject</name>
diff -r 1991e0bd6012 -r 1e29752b51d7 i18n/eric5_tr.ts --- a/i18n/eric5_tr.ts Wed Dec 26 15:42:52 2012 +0100 +++ b/i18n/eric5_tr.ts Sat Dec 29 17:16:46 2012 +0100 @@ -27513,7 +27513,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="733"/> + <location filename="Network/IRC/IrcWidget.py" line="740"/> <source>SSL Error</source> <translation type="unfinished"></translation> </message> @@ -27523,7 +27523,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="698"/> + <location filename="Network/IRC/IrcWidget.py" line="706"/> <source>Socket Error</source> <translation type="unfinished"></translation> </message> @@ -27538,73 +27538,73 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="698"/> + <location filename="Network/IRC/IrcWidget.py" line="702"/> <source>The following network error occurred:<br/>{0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="715"/> + <location filename="Network/IRC/IrcWidget.py" line="722"/> <source>SSL Errors</source> <translation type="unfinished">SSL Hataları</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="715"/> + <location filename="Network/IRC/IrcWidget.py" line="722"/> <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="Network/IRC/IrcWidget.py" line="726"/> - <source>The SSL certificate for the server {0} (port {1}) failed the authenticity check.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Network/IRC/IrcWidget.py" line="733"/> + <source>The SSL certificate for the server {0} (port {1}) failed the authenticity check.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="740"/> <source>Could not connect to {0} (port {1}) using an SSL encrypted connection. Either the server does not support SSL (did you use the correct port?) or you rejected the certificate.<br/>{2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="818"/> + <location filename="Network/IRC/IrcWidget.py" line="825"/> <source>{0} ({1})</source> <comment>channel name, users count</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="847"/> + <location filename="Network/IRC/IrcWidget.py" line="854"/> <source>Critical</source> <translation type="unfinished">Kritik</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="832"/> + <location filename="Network/IRC/IrcWidget.py" line="839"/> <source>No nickname acceptable to the server configured for <b>{0}</b>. Disconnecting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="847"/> + <location filename="Network/IRC/IrcWidget.py" line="854"/> <source>The given nickname is already in use.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="805"/> + <location filename="Network/IRC/IrcWidget.py" line="812"/> <source>CTCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="789"/> + <location filename="Network/IRC/IrcWidget.py" line="796"/> <source>Received Version request from {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="794"/> + <location filename="Network/IRC/IrcWidget.py" line="801"/> <source>Received CTCP-PING request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="799"/> + <location filename="Network/IRC/IrcWidget.py" line="806"/> <source>Received CTCP-CLIENTINFO request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="805"/> + <location filename="Network/IRC/IrcWidget.py" line="812"/> <source>Received unknown CTCP-{0} request from {1}.</source> <translation type="unfinished"></translation> </message> @@ -27628,6 +27628,16 @@ <source>Network</source> <translation type="unfinished">Ağ</translation> </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="698"/> + <source>The SSL handshake failed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="706"/> + <source>A network error occurred.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>JavaScriptEricObject</name>
diff -r 1991e0bd6012 -r 1e29752b51d7 i18n/eric5_zh_CN.GB2312.ts --- a/i18n/eric5_zh_CN.GB2312.ts Wed Dec 26 15:42:52 2012 +0100 +++ b/i18n/eric5_zh_CN.GB2312.ts Sat Dec 29 17:16:46 2012 +0100 @@ -28629,7 +28629,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="733"/> + <location filename="Network/IRC/IrcWidget.py" line="740"/> <source>SSL Error</source> <translation type="unfinished"></translation> </message> @@ -28639,7 +28639,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="698"/> + <location filename="Network/IRC/IrcWidget.py" line="706"/> <source>Socket Error</source> <translation type="unfinished"></translation> </message> @@ -28654,73 +28654,73 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="698"/> + <location filename="Network/IRC/IrcWidget.py" line="702"/> <source>The following network error occurred:<br/>{0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="715"/> + <location filename="Network/IRC/IrcWidget.py" line="722"/> <source>SSL Errors</source> <translation type="unfinished">SSL 错误</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="715"/> + <location filename="Network/IRC/IrcWidget.py" line="722"/> <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="Network/IRC/IrcWidget.py" line="726"/> - <source>The SSL certificate for the server {0} (port {1}) failed the authenticity check.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Network/IRC/IrcWidget.py" line="733"/> + <source>The SSL certificate for the server {0} (port {1}) failed the authenticity check.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="740"/> <source>Could not connect to {0} (port {1}) using an SSL encrypted connection. Either the server does not support SSL (did you use the correct port?) or you rejected the certificate.<br/>{2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="818"/> + <location filename="Network/IRC/IrcWidget.py" line="825"/> <source>{0} ({1})</source> <comment>channel name, users count</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="847"/> + <location filename="Network/IRC/IrcWidget.py" line="854"/> <source>Critical</source> <translation type="unfinished">危险</translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="832"/> + <location filename="Network/IRC/IrcWidget.py" line="839"/> <source>No nickname acceptable to the server configured for <b>{0}</b>. Disconnecting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="847"/> + <location filename="Network/IRC/IrcWidget.py" line="854"/> <source>The given nickname is already in use.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="805"/> + <location filename="Network/IRC/IrcWidget.py" line="812"/> <source>CTCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="789"/> + <location filename="Network/IRC/IrcWidget.py" line="796"/> <source>Received Version request from {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="794"/> + <location filename="Network/IRC/IrcWidget.py" line="801"/> <source>Received CTCP-PING request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="799"/> + <location filename="Network/IRC/IrcWidget.py" line="806"/> <source>Received CTCP-CLIENTINFO request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="805"/> + <location filename="Network/IRC/IrcWidget.py" line="812"/> <source>Received unknown CTCP-{0} request from {1}.</source> <translation type="unfinished"></translation> </message> @@ -28744,6 +28744,16 @@ <source>Network</source> <translation type="unfinished">网络</translation> </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="698"/> + <source>The SSL handshake failed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Network/IRC/IrcWidget.py" line="706"/> + <source>A network error occurred.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>JavaScriptEricObject</name>