SOCKS5 receiving works! :)

[pymsnt] / src / lang.py

diff --git a/src/lang.py b/src/lang.py
index f62d189f4a392ce9a6b87fdcbe93592e7ddc7e60..fe4abaebd71dfd575e555a14f7a4bd2bae8274e9 100644 (file)
--- a/src/lang.py
+++ b/src/lang.py
@@ -3,7 +3,7 @@
 import config
 
 def get(lang=config.lang):
-       if not (isinstance(lang, str) or isinstance(lang, unicode)):
+       if not isinstance(lang, basestring):
                lang = config.lang
        lang = lang.replace("-", "_")
        if hasattr(strings, lang):
@@ -40,7 +40,8 @@ class strings:
                msnDroppedMessage = u"(Automated message)\nA message from this person did not get delivered to you. Please report this to your Jabber server administrator."
                msnInitialMail = u"Hotmail notification\n\nUnread message in inbox: %s\nUnread messages in folders: %s"
                msnRealtimeMail = u"Hotmail notification\n\nFrom: %s <%s>\n Subject: %s"
-               msnDisconnected = u"Disconnection from MSN servers: %s"
+               msnDisconnected = u"Disconnected from MSN servers: %s"
+               msnConnectFailed = u"Failed to connect to MSN servers: %s"
 
                command_CommandList = u"PyMSNt Commands"
                command_Done = "Command completed."
@@ -86,6 +87,7 @@ class strings:
                msnInitialMail = u"Hotmail notification\n\nUnread message in inbox: %s\nUnread messages in folders: %s"
                msnRealtimeMail = u"Hotmail notification\n\nFrom: %s <%s>\n Subject: %s"
                msnDisconnected = u"Desligado dos servidores MSN: %s"
+               msnConnectFailed = u"Failed to connect to MSN servers: %s"
 
                command_CommandList = u"PyMSNt Commands"
                command_Done = "Command completed."
@@ -127,6 +129,7 @@ class strings:
                msnInitialMail = u"Hotmail-meldingen\n\nAantal ongelezen berichten in postvak in: %s\nAantal ongelezen berichten in mappen: %s"
                msnRealtimeMail = u"Hotmail-meldingen\n\nVan: %s <%s>\n Onderwerp: %s"
                msnDisconnected = u"De verbinding met de MSN-servers werd verbroken: %s"
+               msnConnectFailed = u"Failed to connect to MSN servers: %s"
 
                command_CommandList = u"Commando's voor PyMSNt"
                command_Done = "Commando beëindigd."
@@ -172,6 +175,7 @@ class strings:
                msnInitialMail = u"Hotmail notification\n\nUngelesene Nachrichten in der Inbox: %s\nUngelesene Nachrichten in anderen Ordnern: %s"
                msnRealtimeMail = u"Hotmail notification\n\nNeue Nachricht von %s <%s>\n Subject: %s"
                msnDisconnected = u"Die Verbindung zum MSN-Server wurde getrennt: %s"
+               msnConnectFailed = u"Failed to connect to MSN servers: %s"
 
                command_CommandList = u"PyMSNt Commands"
                command_Done = "Command completed."
@@ -214,6 +218,7 @@ class strings:
                msnInitialMail = u"Notification Hotmail\n\n Message(s) non lu(s) dans votre boîte de réception : %s\nMessage(s) non lu(s) dans le dossier : %s"
                msnRealtimeMail = u"Notification Hotmail\n\nDe: %s <%s>\n Sujet: %s"
                msnDisconnected = u"Déconnecté du serveur MSN: %s"
+               msnConnectFailed = u"Failed to connect to MSN servers: %s"
                
                command_CommandList = u"Commandes PyMSNt"
                command_Done = "Command completed."
@@ -261,6 +266,7 @@ class strings:
                msnInitialMail = u"Notificación de Hotmail\n\nMensajes sin leer en la bandeja de entrada: %s\nMensajes sin leer en otras carpetas: %s"
                msnRealtimeMail = u"Notificación de Hotmail\n\nDe: %s <%s>\nAsunto: %s"
                msnDisconnected = u"Desconexión de los servidores MSN: %s"
+               msnConnectFailed = u"Failed to connect to MSN servers: %s"
 
                command_CommandList = u"PyMSNt Commands"
                command_Done = "Command completed."
@@ -321,6 +327,7 @@ class strings:
                msnInitialMail = u"Powiadomienie Hotmail\n\nNieprzeczytane wiadomości w skrzynce odbiorczej: %s\nNieprzeczytane wiadomości w folderach: %s"
                msnRealtimeMail = u"Powiadomienie Hotmail\n\nOd: %s <%s>\n Temat: %s"
                msnDisconnected = u"Rozłączenie z sieci MSN: %s"
+               msnConnectFailed = u"Failed to connect to MSN servers: %s"
 
                command_CommandList = u"Polecenia PyMSNt"
                command_Done = "Polecenie zakończone."